OSS / Commercial dual-licensing: Remove some commercial code sections from publicly available GitHub repository.

This commit is contained in:
Lukas Eder 2013-10-07 15:46:01 +02:00
parent ef9080435c
commit 444cf8df47
2 changed files with 20 additions and 17 deletions

View File

@ -7,25 +7,26 @@
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/jOOQ"/>
<classpathentry combineaccessrules="false" exported="true" kind="src" path="/jOOQ-codegen"/>
<classpathentry exported="true" kind="lib" path="lib/commons-io-1.4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ojdbc6.jar"/>
<!-- [pro] xxx
xxxxxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxx xxxxxxxxxxxxxxx xxxxxxxxxx xxxxxxxxxxxxxxxxxxxxxxx
xxxx [/pro] -->
<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar" sourcepath="/jOOQ-sources/hsqldb-2.2.4.zip"/>
<classpathentry exported="true" kind="lib" path="lib/db2jcc4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/derby.jar" sourcepath="/jOOQ-sources/db-derby-10.8.1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/derbyclient.jar" sourcepath="/jOOQ-sources/db-derby-10.8.1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/derbynet.jar" sourcepath="/jOOQ-sources/db-derby-10.8.1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/derbytools.jar" sourcepath="/jOOQ-sources/db-derby-10.8.1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/derbyrun.jar" sourcepath="/jOOQ-sources/db-derby-10.8.1.2-src.zip"/>
<classpathentry exported="true" kind="lib" path="lib/sqljdbc4.jar"/>
<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
<classpathentry exported="true" kind="lib" path="lib/postgresql-9.0-801.jdbc4.jar" sourcepath="/jOOQ-sources/postgresql-jdbc-9.0-801.src.zip"/>
<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.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.2.0.0155-cubrid.jar"/>
<classpathentry exported="true" kind="lib" path="lib/rsyntaxtextarea-2.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jaybird-2.2.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/connector-api-1.5.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr-runtime-3.4.jar"/>

View File

@ -174,7 +174,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.postgresql.util.PSQLException;
import com.microsoft.sqlserver.jdbc.SQLServerException;
// ...
/**
* The abstract test suite uses generic types to model the generated test schema
@ -358,15 +358,17 @@ public abstract class jOOQAbstractTest<
continue;
}
}
// There is no DROP ** IF EXISTS statement in SQL Server
else if (e.getClass().getName().startsWith("com.microsoft")) {
switch (((SQLServerException)e).getErrorCode()) {
case 3701: // Tables
case 218: // Types
continue;
}
}
/* [pro] xx
xx xxxxx xx xx xxxx xx xx xxxxxx xxxxxxxxx xx xxx xxxxxx
xxxx xx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
xxxxxx xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx x
xxxx xxxxx xx xxxxxx
xxxx xxxx xx xxxxx
xxxxxxxxx
x
x
xx [/pro] */
else if (e.getMessage().startsWith("Cannot drop")) {
continue;