github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[#2566] Upgrade integration test jTDS version to 1.3.1

Browse Source
This commit is contained in:
Lukas Eder 2013-06-28 14:06:18 +02:00
parent fc54860099
commit a4eded5b46
9 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-test/.classpath
View File

@ -21,7 +21,7 @@
<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.15-bin.jar" sourcepath="/jOOQ-sources/mysql-connector-java-5.1.15.zip"/>
<classpathentry exported="true" kind="lib" path="lib/log4j-1.2.16.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jconn3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jtds-1.2.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jtds-1.3.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/iijdbc.jar"/>
<classpathentry exported="true" kind="lib" path="lib/h2-1.3.170.jar" sourcepath="/h2"/>
<classpathentry exported="true" kind="lib" path="lib/JDBC-9.1.0.0212-cubrid.jar"/>

10
jOOQ-test/configuration/org/jooq/configuration/lukas/sqlserver/library-jtds.xml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<configuration xmlns="http://www.jooq.org/xsd/jooq-codegen-2.1.0.xsd">
<jdbc>
<driver>net.sourceforge.jtds.jdbc.Driver</driver>
<url>jdbc:jtds:sqlserver://localhost:1433;databaseName=test;integratedSecurity=true</url>
<schema>dbo</schema>
<user></user>
<password></password>
</jdbc>
</configuration>

2
jOOQ-test/launch/GenerationTool Sybase ASE test.launch
View File

@ -23,7 +23,7 @@
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-meta&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&quot; javaProject=&quot;jOOQ-meta&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/log4j-1.2.16.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jtds-1.2.5.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jtds-1.3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

2
jOOQ-test/launch/Meta-Generate Sybase ASE sys.launch
View File

@ -19,7 +19,7 @@
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jconn3.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;jOOQ-meta&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER&quot; javaProject=&quot;jOOQ-meta&quot; path=&quot;3&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jtds-1.2.5.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/jOOQ-test/lib/jtds-1.3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>

20
jOOQ-test/launch/SQLServerTest (jTDS).launch Normal file
View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/jOOQ-test/src/org/jooq/test/SQLServerTest.java"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="1"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.ui.favoriteGroups">
<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
<listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.jooq.test.SQLServerTest"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="jOOQ-test"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.jooq.configuration=/org/jooq/configuration/${env_var:USERNAME}/sqlserver/library-jtds.xml&#13;&#10;-Djava.library.path=C:\jtds-1.3.1-dist\x64\SSO"/>
</launchConfiguration>

BIN
jOOQ-test/lib/jtds-1.2.5.jar
View File

Binary file not shown.

BIN
jOOQ-test/lib/jtds-1.3.1.jar Normal file
View File

Binary file not shown.

BIN
jOOQ-test/lib/sqlite-jdbc-3.7.2.jar
View File

Binary file not shown.

26
jOOQ-test/src/org/jooq/test/jOOQAbstractTest.java
View File

@ -53,6 +53,7 @@ import java.math.BigDecimal;
import java.math.BigInteger;
import java.sql.Connection;
import java.sql.Date;
import java.sql.Driver;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.SQLSyntaxErrorException;
@ -362,6 +363,10 @@ public abstract class jOOQAbstractTest<
}
}
else if (e.getMessage().startsWith("Cannot drop")) {
continue;
}
// There is no DROP SEQUENCE IF EXISTS statement in Sybase
else if (e.getClass().getName().startsWith("com.sybase")) {
if (sql.contains("DROP SEQUENCE")) {
@ -654,19 +659,22 @@ public abstract class jOOQAbstractTest<
jdbc.getPassword() != null ? jdbc.getPassword() :
getProperty(jdbc.getProperties(), "password");
Class.forName(driver);
if (StringUtils.isBlank(jdbcUser)) {
Properties p = new Properties();
if (getClass().getSimpleName().toLowerCase().contains("ingres")) {
p.setProperty("timezone", "EUROPE-CENTRAL");
}
return DriverManager.getConnection(getJdbcURL(), p);
Properties info = new Properties();
if (getClass().getSimpleName().toLowerCase().contains("ingres")) {
info.setProperty("timezone", "EUROPE-CENTRAL");
}
Driver d = ((Driver) Class.forName(driver).newInstance());
if (!StringUtils.isBlank(jdbcUser)) {
info.put("user", jdbcUser);
info.put("password", jdbcPassword);
}
else {
return DriverManager.getConnection(getJdbcURL(), jdbcUser, jdbcPassword);
}
return d != null
? d.connect(getJdbcURL(), info)
: DriverManager.getConnection(getJdbcURL(), info);
}
catch (Exception e) {
throw new Error(e);