worked on oracle tests

This commit is contained in:
Timo Westkämper 2012-02-16 20:50:19 +02:00
parent ada0cff722
commit 730bd62a84
13 changed files with 41 additions and 32 deletions

View File

@ -1,6 +1,6 @@
----------------------------------------------------------------
Wed Feb 15 22:46:44 EET 2012:
Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.2.2 - (1181258): instance a816c00e-0135-82c4-6742-0000036a8538
Thu Feb 16 19:12:12 EET 2012:
Booting Derby version The Apache Software Foundation - Apache Derby - 10.8.2.2 - (1181258): instance a816c00e-0135-8726-5697-0000036b0708
on database directory /home/tiwe/work/querydsl/querydsl-sql/target/demoDB with class loader sun.misc.Launcher$AppClassLoader@1a16869
Loaded from file:/home/tiwe/.m2/repository/org/apache/derby/derby/10.8.2.2/derby-10.8.2.2.jar
java.vendor=Sun Microsystems Inc.

View File

@ -260,8 +260,8 @@ public class MetaDataExporter {
classModel.getData().put(InverseForeignKeyData.class, inverseForeignKeyData.values());
}
// collect columns
ResultSet columns = md.getColumns(null, schemaPattern, tableName, null);
// collect columns
ResultSet columns = md.getColumns(null, schemaPattern, tableName.replace("/", "//"), null);
try{
while (columns.next()) {
handleColumn(classModel, tableName, columns);

View File

@ -409,6 +409,17 @@ public final class Connections {
stmt.execute("create table SURVEY (ID number(10,0), " +
"NAME varchar(30 char)," +
"NAME2 varchar(30 char))");
stmt.execute("drop sequence survey_seq");
stmt.execute("create sequence survey_seq");
stmt.execute("create or replace trigger survey_trigger\n"+
"before insert on survey\n"+
"for each row\n" +
"when (new.id is null)\n"+
"begin\n"+
" select survey_seq.nextval into :new.id from dual;\n"+
"end;\n");
stmt.execute("insert into SURVEY values (1,'Hello World','Hello')");
// test
@ -459,7 +470,17 @@ public final class Connections {
// survey
dropTable(templates, "SURVEY");
stmt.execute(quote("create table \"SURVEY\"(\"ID\" int, \"NAME\" varchar(30), \"NAME2\" varchar(30))"));
try {
stmt.execute("drop sequence SURVEY_SEQ");
} catch(SQLException e) {
if (!e.getMessage().contains("does not exist")) {
throw e;
}
}
stmt.execute("create sequence SURVEY_SEQ");
stmt.execute("create table \"SURVEY\"(" +
"\"ID\" int DEFAULT NEXTVAL('SURVEY_SEQ'), " +
"\"NAME\" varchar(30), \"NAME2\" varchar(30))");
stmt.execute("insert into \"SURVEY\" values (1, 'Hello World')");
// test

View File

@ -33,15 +33,18 @@ public abstract class ExportBaseTest {
File folder = new File("target", getClass().getSimpleName());
folder.mkdirs();
NamingStrategy namingStrategy = new DefaultNamingStrategy();
// Serializer serializer = new MetaDataSerializer("Q", "", "", "", null, namingStrategy, false);
MetaDataExporter exporter = new MetaDataExporter();
exporter.setSchemaPattern(getSchemaPattern());
exporter.setPackageName("test");
exporter.setTargetFolder(folder);
exporter.setNamingStrategy(namingStrategy);
// exporter.setSerializer(serializer);
exporter.export(Connections.getConnection().getMetaData());
}
protected String getSchemaPattern() {
return null;
}
@AfterClass
public static void tearDownAfterClass() throws SQLException {
Connections.close();

View File

@ -25,8 +25,9 @@ import org.junit.Test;
import com.mysema.query.sql.dml.SQLInsertClause;
public abstract class LikeEscapeBaseTest extends AbstractBaseTest{
private void reset() throws SQLException{
@Before
public void setUp() throws SQLException{
delete(survey).execute();
SQLInsertClause insert = insert(survey);
insert.set(survey.id, 5).set(survey.name, "aaa").addBatch();
@ -35,14 +36,10 @@ public abstract class LikeEscapeBaseTest extends AbstractBaseTest{
insert.execute();
}
@Before
public void setUp() throws SQLException{
reset();
}
@After
public void tearDown() throws SQLException{
reset();
delete(survey).execute();
insert(survey).values(1, "Hello World", "Hello").execute();
}
@Test

View File

@ -23,9 +23,7 @@ import com.mysema.query.DeleteBaseTest;
import com.mysema.query.Target;
import com.mysema.query.sql.OracleTemplates;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
public class DeleteOracleTest extends DeleteBaseTest{

View File

@ -14,18 +14,20 @@
package com.mysema.query._oracle;
import org.junit.BeforeClass;
import org.junit.Ignore;
import com.mysema.query.Connections;
import com.mysema.query.ExportBaseTest;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
public class ExportOracleTest extends ExportBaseTest{
@BeforeClass
public static void setUpClass() throws Exception {
Connections.initOracle();
}
@Override
public String getSchemaPattern() {
return "QUERYDSL";
}
}

View File

@ -23,9 +23,7 @@ import com.mysema.query.InsertBaseTest;
import com.mysema.query.Target;
import com.mysema.query.sql.OracleTemplates;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
public class InsertOracleTest extends InsertBaseTest{

View File

@ -23,9 +23,7 @@ import com.mysema.query.LikeEscapeBaseTest;
import com.mysema.query.Target;
import com.mysema.query.sql.OracleTemplates;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
public class LikeEscapeOracleTest extends LikeEscapeBaseTest{

View File

@ -23,9 +23,7 @@ import com.mysema.query.MergeBaseTest;
import com.mysema.query.Target;
import com.mysema.query.sql.OracleTemplates;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
public class MergeOracleTest extends MergeBaseTest{

View File

@ -22,9 +22,7 @@ import com.mysema.query.SkipForQuoted;
import com.mysema.query.Target;
import com.mysema.query.sql.OracleTemplates;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
@SkipForQuoted
public class SelectOracleQuotedTest extends SelectBaseTest {

View File

@ -36,9 +36,7 @@ import com.mysema.query.sql.oracle.OracleQuery;
import com.mysema.query.types.expr.Wildcard;
import com.mysema.query.types.path.NumberPath;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
public class SelectOracleTest extends SelectBaseTest {

View File

@ -23,9 +23,7 @@ import com.mysema.query.Target;
import com.mysema.query.UpdateBaseTest;
import com.mysema.query.sql.OracleTemplates;
import com.mysema.testutil.Label;
import com.mysema.testutil.ResourceCheck;
@ResourceCheck("/oracle.run")
@Label(Target.ORACLE)
public class UpdateOracleTest extends UpdateBaseTest{