From 730bd62a8428cfdfdcc2bc27231d22617c2b7366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= Date: Thu, 16 Feb 2012 20:50:19 +0200 Subject: [PATCH] worked on oracle tests --- querydsl-sql/derby.log | 4 ++-- .../mysema/query/sql/MetaDataExporter.java | 4 ++-- .../java/com/mysema/query/Connections.java | 23 ++++++++++++++++++- .../java/com/mysema/query/ExportBaseTest.java | 7 ++++-- .../com/mysema/query/LikeEscapeBaseTest.java | 13 ++++------- .../query/_oracle/DeleteOracleTest.java | 2 -- .../query/_oracle/ExportOracleTest.java | 8 ++++--- .../query/_oracle/InsertOracleTest.java | 2 -- .../query/_oracle/LikeEscapeOracleTest.java | 2 -- .../mysema/query/_oracle/MergeOracleTest.java | 2 -- .../query/_oracle/SelectOracleQuotedTest.java | 2 -- .../query/_oracle/SelectOracleTest.java | 2 -- .../query/_oracle/UpdateOracleTest.java | 2 -- 13 files changed, 41 insertions(+), 32 deletions(-) diff --git a/querydsl-sql/derby.log b/querydsl-sql/derby.log index 55e3ece34..e97807658 100644 --- a/querydsl-sql/derby.log +++ b/querydsl-sql/derby.log @@ -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. diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java b/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java index 2d029835d..510d7f130 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/MetaDataExporter.java @@ -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); diff --git a/querydsl-sql/src/test/java/com/mysema/query/Connections.java b/querydsl-sql/src/test/java/com/mysema/query/Connections.java index e8478176a..9d1e481b9 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java +++ b/querydsl-sql/src/test/java/com/mysema/query/Connections.java @@ -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 diff --git a/querydsl-sql/src/test/java/com/mysema/query/ExportBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/ExportBaseTest.java index b8162e4e5..0f49d7433 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/ExportBaseTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/ExportBaseTest.java @@ -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(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBaseTest.java index d11f74b8b..28fabd8aa 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBaseTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/LikeEscapeBaseTest.java @@ -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 diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/DeleteOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/DeleteOracleTest.java index b6d203cf7..23704088e 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/DeleteOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/DeleteOracleTest.java @@ -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{ diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/ExportOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/ExportOracleTest.java index 465e7fb23..b7bb8f410 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/ExportOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/ExportOracleTest.java @@ -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"; + } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/InsertOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/InsertOracleTest.java index 7aa01f76a..9e7c73b6e 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/InsertOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/InsertOracleTest.java @@ -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{ diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/LikeEscapeOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/LikeEscapeOracleTest.java index 7f913aabe..48a4fd95b 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/LikeEscapeOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/LikeEscapeOracleTest.java @@ -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{ diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/MergeOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/MergeOracleTest.java index 23f51ff17..32fbf1274 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/MergeOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/MergeOracleTest.java @@ -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{ diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleQuotedTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleQuotedTest.java index bdec54908..6965f6855 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleQuotedTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleQuotedTest.java @@ -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 { diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleTest.java index ac7b0936a..051a00fe8 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/SelectOracleTest.java @@ -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 { diff --git a/querydsl-sql/src/test/java/com/mysema/query/_oracle/UpdateOracleTest.java b/querydsl-sql/src/test/java/com/mysema/query/_oracle/UpdateOracleTest.java index 101eaf3c7..473315722 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/_oracle/UpdateOracleTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/_oracle/UpdateOracleTest.java @@ -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{