Project

General

Profile

« Previous | Next » 

Revision 45fd6fd3

Added by Andreas Müller about 5 years ago

ref #8118 update mysql driver path in code and tests

View differences:

cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/Source.java
72 72 
    private static String clsSQLServerDdtek = "com.ddtek.jdbc.sqlserver.SQLServerDriver";
73 73 
    private static String clsDefault = "com.microsoft.jdbc.sqlserver.SQLServerDriver";
74 74 
    private static String clsPostgreSQL = "org.postgresql.Driver";
75 
    private static String clsMySQL = "com.mysql.jdbc.Driver";
75 
    private static String clsMySQL = "com.mysql.cj.jdbc.Driver";
76 76 

  		




  77
  77
  
    
    //url


  		




  78
  78
  
    
//    private static String urlSQLServer = "jdbc:microsoft:sqlserver://";


  		












  

    
      cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/cdm.datasources.xml
    
  





  9
  9
  
    

  		




  10
  10
  
    
<!-- JDBC datasource pattern example -->


  		




  11
  11
  
    
<!--  	<bean id="defaultDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">-->


  		




  12
  
  
    
<!--        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>-->


  		




  
  12
  
    
<!--        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>-->


  		




  13
  13
  
    
<!--        <property name="url" value="testUrl"/>-->


  		




  14
  14
  
    
<!--        <property name="username" value="testUser"/>-->


  		




  15
  15
  
    
<!--        <property name="password" value="testPassword"/>-->


  		












  

    
      cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
    
  





  159
  159
  
    
	 */


  		




  160
  160
  
    
	@Test


  		




  161
  161
  
    
	public void testGetDbProperty() {


  		




  162
  
  
    
		assertEquals("com.mysql.jdbc.Driver", dataSource.getCdmSourceProperty(CdmSourceProperties.DRIVER_CLASS));


  		




  
  162
  
    
		assertEquals("com.mysql.cj.jdbc.Driver", dataSource.getCdmSourceProperty(CdmSourceProperties.DRIVER_CLASS));


  		




  163
  163
  
    
	}


  		




  164
  164
  
    

  		




  165
  165
  
    
	/**


  		




  ......




  169
  169
  
    
	public void testGetDatasourceBean() {


  		




  170
  170
  
    
		BeanDefinition beanDef = dataSource.getDatasourceBean();


  		




  171
  171
  
    
		PropertyValues propValues = beanDef.getPropertyValues();


  		




  172
  
  
    
		String propName =  "driverClassName"; 


  		




  173
  
  
    
		assertEquals("com.mysql.jdbc.Driver", propValues.getPropertyValue(propName).getValue());


  		




  174
  
  
    
		propName =  "url"; 


  		




  
  172
  
    
		String propName =  "driverClassName";


  		




  
  173
  
    
		assertEquals("com.mysql.cj.jdbc.Driver", propValues.getPropertyValue(propName).getValue());


  		




  
  174
  
    
		propName =  "url";


  		




  175
  175
  
    
		assertEquals("testUrl", propValues.getPropertyValue(propName).getValue());


  		




  176
  
  
    
		propName =  "username"; 


  		




  
  176
  
    
		propName =  "username";


  		




  177
  177
  
    
		assertEquals("testUser", propValues.getPropertyValue(propName).getValue());


  		




  178
  
  
    
		propName =  "password"; 


  		




  
  178
  
    
		propName =  "password";


  		




  179
  179
  
    
		assertEquals("testPassword", propValues.getPropertyValue(propName).getValue());


  		




  180
  180
  
    
	}


  		




  181
  181
  
    

  		












  

    
      cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseTypeEnumTest.java
    
  





  59
  59
  
    
	 */


  		




  60
  60
  
    
	@Test


  		




  61
  61
  
    
	public void testGetDriverClassName() {


  		




  62
  
  
    
		assertEquals("com.mysql.jdbc.Driver", DatabaseTypeEnumTest.dbEnum.getDriverClassName());


  		




  
  62
  
    
		assertEquals("com.mysql.cj.jdbc.Driver", DatabaseTypeEnumTest.dbEnum.getDriverClassName());


  		




  63
  63
  
    
	}


  		




  64
  64
  
    

  		




  65
  65
  
    
	/**


  		




  ......




  130
  130
  
    
		//does not work anymore as SQLServer driver is ambigous


  		




  131
  131
  
    
		//assertEquals(DatabaseTypeEnum.SqlServer2000, DatabaseTypeEnum.getDatabaseEnumByDriverClass("com.microsoft.sqlserver.jdbc.SQLServerDriver"));


  		




  132
  132
  
    
		//assertEquals(DatabaseTypeEnum.SqlServer2005, DatabaseTypeEnum.getDatabaseEnumByDriverClass("com.microsoft.sqlserver.jdbc.SQLServerDriver"));


  		




  133
  
  
    
		assertEquals(DatabaseTypeEnum.MySQL, DatabaseTypeEnum.byDriverClass("com.mysql.jdbc.Driver"));


  		




  
  133
  
    
		assertEquals(DatabaseTypeEnum.MySQL, DatabaseTypeEnum.byDriverClass("com.mysql.cj.jdbc.Driver"));


  		




  134
  134
  
    
		assertEquals(null, DatabaseTypeEnum.byDriverClass("com.microsoft.xxx"));


  		




  135
  135
  
    
	}


  		




  136
  136
  
    

  		












  

    
      cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml
    
  





  8
  8
  
    
    http://www.springframework.org/schema/context/spring-context-4.0.xsd">


  		




  9
  9
  
    

  		




  10
  10
  
    
  	<bean id="defaultDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">


  		




  11
  
  
    
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>


  		




  
  11
  
    
        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>


  		




  12
  12
  
    
        <property name="url" value="testUrl"/>


  		




  13
  13
  
    
        <property name="username" value="testUser"/>


  		




  14
  14
  
    
        <property name="password" value="testPassword"/>


  		












  

    
      cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml
    
  





  19
  19
  
    
   </bean>


  		




  20
  20
  
    

  		




  21
  21
  
    
    <bean id="cichorieaeDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">


  		




  22
  
  
    
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>


  		




  
  22
  
    
        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>


  		




  23
  23
  
    
        <property name="username" value="${local.usr}"/>


  		




  24
  24
  
    
        <property name="password" value="${local.pwd}"/>


  		




  25
  25
  
    
        <property name="url" value="jdbc:mysql://${local.host}/cdm_local_cichorieae"/>


  		




  26
  26
  
    
    </bean>


  		




  27
  27
  
    
    <bean id="palmaeDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">


  		




  28
  
  
    
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>


  		




  
  28
  
    
        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>


  		




  29
  29
  
    
        <property name="username" value="${local.usr}"/>


  		




  30
  30
  
    
        <property name="password" value="${local.pwd}"/>


  		




  31
  31
  
    
        <property name="url" value="jdbc:mysql://${local.host}/cdm_local_palmae"/>


  		




  32
  32
  
    
    </bean>


  		




  33
  33
  
    

  		




  34
  34
  
    
    <bean id="dipteraDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">


  		




  35
  
  
    
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>


  		




  
  35
  
    
        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>


  		




  36
  36
  
    
        <property name="username" value="${local.usr}"/>


  		




  37
  37
  
    
        <property name="password" value="${local.pwd}"/>


  		




  38
  38
  
    
        <property name="url" value="jdbc:mysql://${local.host}/cdm_local_diptera"/>


  		












  

    
      cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml
    
  





  17
  17
  
    
   </bean>


  		




  18
  18
  
    

  		




  19
  19
  
    
    <bean id="empty_defaultDataSource"  lazy-init="true" class="org.springframework.jdbc.datasource.DriverManagerDataSource">


  		




  20
  
  
    
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>


  		




  
  20
  
    
        <property name="driverClassName" value="com.mysql.cj.jdbc.Driver"/>


  		




  21
  21
  
    
        <property name="username" value="${local.usr}"/>


  		




  22
  22
  
    
        <property name="password" value="${local.pwd}"/>


  		




  23
  23
  
    
        <property name="url" value="jdbc:mysql://${local.host}/cdm_empty_default"/>


  		












  

    
      cdmlib-test/src/main/resources/unitils.properties
    
  





  98
  98
  
    
#    exactly match the table names in the database. This means in order to use mysql for tests we would


  		




  99
  99
  
    
#    have to change the table names in all of our DataSet files.


  		




  100
  100
  
    
#


  		




  101
  
  
    
#database.driverClassName=com.mysql.jdbc.Driver


  		




  
  101
  
    
#database.driverClassName=com.mysql.cj.jdbc.Driver


  		




  102
  102
  
    
#database.url=jdbc:mysql://127.0.0.1:3306/test


  		




  103
  103
  
    
#database.userName=edit


  		




  104
  104
  
    
#database.password=wp5


  		












Also available in:  Unified diff