diff --git a/querydsl-root/pom.xml b/querydsl-root/pom.xml index ed0d6b04a..18cde5a6d 100644 --- a/querydsl-root/pom.xml +++ b/querydsl-root/pom.xml @@ -510,8 +510,8 @@ com.mysema.testutil.DummyInterface **/*$* - **/MSSQLSuiteTest.java - **/TeradataSuiteTest.java + **/MSSQL*SuiteTest.java + **/Teradata*SuiteTest.java @@ -532,10 +532,10 @@ **/*$* **/ExportOracleTest.java **/ExportTeradataTest.java - **/OracleSuiteTest.java + **/Oracle*SuiteTest.java **/OracleWithQuotingTest.java - **/MSSQLSuiteTest.java - **/TeradataSuiteTest.java + **/MSSQL*SuiteTest.java + **/Teradata*SuiteTest.java diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java index fb5d08e36..b8ff49f6d 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeoDBTemplates.java @@ -50,4 +50,13 @@ public class GeoDBTemplates extends H2Templates { add(SpatialTemplatesSupport.getSpatialOps(true)); } + public String serialize(String literal, int jdbcType) { + // TODO better check for spatial literals + if (literal.startsWith("ST_")) { + return literal; + } else { + return super.serialize(literal, jdbcType); + } + } + } \ No newline at end of file diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java index cafe65ad4..fc2caed40 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWkbType.java @@ -13,13 +13,13 @@ */ package com.mysema.query.sql.spatial; -import javax.annotation.Nullable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import com.mysema.query.sql.types.AbstractType; +import javax.annotation.Nullable; + import org.geolatte.geom.ByteBuffer; import org.geolatte.geom.ByteOrder; import org.geolatte.geom.Geometry; @@ -28,6 +28,8 @@ import org.geolatte.geom.codec.WkbDecoder; import org.geolatte.geom.codec.WkbEncoder; import org.geolatte.geom.codec.Wkt; +import com.mysema.query.sql.types.AbstractType; + /** * @author tiwe * @@ -71,8 +73,7 @@ public class GeometryWkbType extends AbstractType { @Override public String getLiteral(Geometry geometry) { - String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); - return "'" + str + "'"; + return Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); } } diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java index 941ab6229..3738da691 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktClobType.java @@ -13,13 +13,15 @@ */ package com.mysema.query.sql.spatial; -import javax.annotation.Nullable; import java.sql.*; -import com.mysema.query.sql.types.AbstractType; +import javax.annotation.Nullable; + import org.geolatte.geom.Geometry; import org.geolatte.geom.codec.Wkt; +import com.mysema.query.sql.types.AbstractType; + /** * @author tiwe * @@ -57,8 +59,7 @@ public class GeometryWktClobType extends AbstractType { @Override public String getLiteral(Geometry geometry) { - String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); - return "'" + str + "'"; + return Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); } } diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java index 00abee470..7ec344986 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/GeometryWktType.java @@ -13,16 +13,18 @@ */ package com.mysema.query.sql.spatial; -import javax.annotation.Nullable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import com.mysema.query.sql.types.AbstractType; +import javax.annotation.Nullable; + import org.geolatte.geom.Geometry; import org.geolatte.geom.codec.Wkt; +import com.mysema.query.sql.types.AbstractType; + /** * @author tiwe * @@ -59,7 +61,6 @@ public class GeometryWktType extends AbstractType { @Override public String getLiteral(Geometry geometry) { - String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); - return "'" + str + "'"; + return Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); } } diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java index 9d7ffb4d8..743b4ddf0 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/MySQLSpatialTemplates.java @@ -52,4 +52,13 @@ public class MySQLSpatialTemplates extends MySQLTemplates { add(SpatialOps.NUM_INTERIOR_RING, "NumInteriorRings({0})"); } + public String serialize(String literal, int jdbcType) { + // TODO better check for spatial literals + if (literal.startsWith("GeomFromText")) { + return literal; + } else { + return super.serialize(literal, jdbcType); + } + } + } diff --git a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java index f35847f10..5b36fc554 100644 --- a/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java +++ b/querydsl-sql/src/main/java/com/mysema/query/sql/spatial/PGgeometryType.java @@ -13,17 +13,19 @@ */ package com.mysema.query.sql.spatial; -import javax.annotation.Nullable; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import com.mysema.query.sql.types.AbstractType; +import javax.annotation.Nullable; + import org.geolatte.geom.Geometry; import org.geolatte.geom.codec.Wkt; import org.postgis.PGgeometry; +import com.mysema.query.sql.types.AbstractType; + /** * @author tiwe * @@ -56,8 +58,7 @@ public class PGgeometryType extends AbstractType { @Override public String getLiteral(Geometry geometry) { - String str = Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); - return "'" + str + "'"; + return Wkt.newEncoder(Wkt.Dialect.POSTGIS_EWKT_1).encode(geometry); } } diff --git a/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java b/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java index 7aaabe3cc..acb536233 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/AbstractBaseTest.java @@ -13,10 +13,18 @@ */ package com.mysema.query; -import javax.annotation.Nullable; +import static org.junit.Assert.assertEquals; + import java.sql.Connection; import java.util.List; +import javax.annotation.Nullable; + +import org.junit.Rule; +import org.junit.rules.MethodRule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.mysema.query.dml.DMLClause; import com.mysema.query.sql.*; import com.mysema.query.sql.dml.SQLDeleteClause; @@ -26,11 +34,6 @@ import com.mysema.query.sql.dml.SQLUpdateClause; import com.mysema.query.sql.mysql.MySQLReplaceClause; import com.mysema.query.sql.teradata.TeradataQuery; import com.mysema.query.sql.types.XMLAsStringType; -import org.junit.Rule; -import org.junit.rules.MethodRule; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import static org.junit.Assert.assertEquals; public abstract class AbstractBaseTest { @@ -68,11 +71,11 @@ public abstract class AbstractBaseTest { protected Connection connection = Connections.getConnection(); - protected SQLTemplates templates = Connections.getTemplates(); - protected Target target = Connections.getTarget(); - protected Configuration configuration = new Configuration(templates); + protected Configuration configuration = Connections.getConfiguration(); + + protected SQLTemplates templates = configuration.getTemplates(); @Nullable protected String expectedQuery; 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 b0b54059b..35287d7c4 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/Connections.java +++ b/querydsl-sql/src/test/java/com/mysema/query/Connections.java @@ -36,7 +36,7 @@ public final class Connections { private static ThreadLocal targetHolder = new ThreadLocal(); - private static ThreadLocal templatesHolder = new ThreadLocal(); + private static ThreadLocal configurationHolder = new ThreadLocal(); // datetest private static final String CREATE_TABLE_DATETEST = "create table DATE_TEST(DATE_TEST date)"; @@ -79,12 +79,16 @@ public final class Connections { return targetHolder.get(); } - public static SQLTemplates getTemplates() { - return templatesHolder.get(); + public static Configuration getConfiguration() { + return configurationHolder.get(); + } + + public static void setConfiguration(Configuration conf) { + configurationHolder.set(conf); } public static void setTemplates(SQLTemplates templates) { - templatesHolder.set(templates); + configurationHolder.set(new Configuration(templates)); } private static Connection getDerby() throws SQLException, ClassNotFoundException { diff --git a/querydsl-sql/src/test/java/com/mysema/query/DeleteUseLiteralsBase.java b/querydsl-sql/src/test/java/com/mysema/query/DeleteUseLiteralsBase.java deleted file mode 100644 index d6558b0ab..000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/DeleteUseLiteralsBase.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mysema.query; - -public class DeleteUseLiteralsBase extends DeleteBase { - - public DeleteUseLiteralsBase() { - configuration.setUseLiterals(true); - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/InsertUseLiteralsBase.java b/querydsl-sql/src/test/java/com/mysema/query/InsertUseLiteralsBase.java deleted file mode 100644 index f00b5e672..000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/InsertUseLiteralsBase.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mysema.query; - -public class InsertUseLiteralsBase extends InsertBase { - - public InsertUseLiteralsBase() { - configuration.setUseLiterals(true); - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/MergeUseLiteralsBase.java b/querydsl-sql/src/test/java/com/mysema/query/MergeUseLiteralsBase.java deleted file mode 100644 index cfc3a00c9..000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/MergeUseLiteralsBase.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mysema.query; - -public class MergeUseLiteralsBase extends MergeBase { - - public MergeUseLiteralsBase() { - configuration.setUseLiterals(true); - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/SelectUseLiteralsBase.java b/querydsl-sql/src/test/java/com/mysema/query/SelectUseLiteralsBase.java deleted file mode 100644 index bd6bb5e1d..000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/SelectUseLiteralsBase.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Copyright 2013, Mysema Ltd - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.mysema.query; - -public class SelectUseLiteralsBase extends SelectBase { - - public SelectUseLiteralsBase() { - configuration.setUseLiterals(true); - } - - @Override - public void Limit_and_Offset2() { - // not supported - } - - @Override - public void Path_Alias() { - // not supported - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/UpdateUseLiteralsBase.java b/querydsl-sql/src/test/java/com/mysema/query/UpdateUseLiteralsBase.java deleted file mode 100644 index b37c4f9e5..000000000 --- a/querydsl-sql/src/test/java/com/mysema/query/UpdateUseLiteralsBase.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.mysema.query; - -public class UpdateUseLiteralsBase extends UpdateBase { - - public UpdateUseLiteralsBase() { - configuration.setUseLiterals(true); - } - -} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java new file mode 100644 index 000000000..e167a181e --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDLiteralsSuiteTest.java @@ -0,0 +1,31 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.CUBRIDTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class CUBRIDLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initCubrid(); + Connections.setTemplates(CUBRIDTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java index f38e35958..9bad786e3 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/CUBRIDSuiteTest.java @@ -1,9 +1,9 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; +import com.mysema.query.*; import com.mysema.query.sql.CUBRIDTemplates; import com.mysema.testutil.ExternalDB; @@ -21,13 +21,6 @@ public class CUBRIDSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initCubrid(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java new file mode 100644 index 000000000..508615bce --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbyLiteralsSuiteTest.java @@ -0,0 +1,28 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; + +import com.mysema.query.*; +import com.mysema.query.sql.DerbyTemplates; + +public class DerbyLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initDerby(); + Connections.setTemplates(DerbyTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java index 6fe260107..6e6f7c49c 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/DerbySuiteTest.java @@ -1,8 +1,8 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; +import com.mysema.query.*; import com.mysema.query.sql.DerbyTemplates; public class DerbySuiteTest extends AbstractSuite { @@ -18,13 +18,6 @@ public class DerbySuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initDerby(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java new file mode 100644 index 000000000..a2f3934df --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdLiteralsSuiteTest.java @@ -0,0 +1,30 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.FirebirdTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class FirebirdLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initFirebird(); + Connections.setTemplates(FirebirdTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java index a646db00e..2f937a6ac 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/FirebirdSuiteTest.java @@ -1,10 +1,11 @@ package com.mysema.query.suites; +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + import com.mysema.query.*; import com.mysema.query.sql.FirebirdTemplates; import com.mysema.testutil.ExternalDB; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; @Category(ExternalDB.class) public class FirebirdSuiteTest extends AbstractSuite { @@ -20,13 +21,6 @@ public class FirebirdSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initFirebird(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java new file mode 100644 index 000000000..7969379fe --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2LiteralsSuiteTest.java @@ -0,0 +1,29 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; + +import com.mysema.query.*; +import com.mysema.query.sql.spatial.GeoDBTemplates; + +public class H2LiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Spatial extends SpatialBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initH2(); + Connections.setTemplates(GeoDBTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java index 2931d275e..34c729572 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2SuiteTest.java @@ -1,8 +1,9 @@ package com.mysema.query.suites; +import org.junit.BeforeClass; + import com.mysema.query.*; import com.mysema.query.sql.spatial.GeoDBTemplates; -import org.junit.BeforeClass; public class H2SuiteTest extends AbstractSuite { @@ -18,13 +19,6 @@ public class H2SuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initH2(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java index 53914ebd9..a69e0c581 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithQuotingTest.java @@ -1,8 +1,8 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; +import com.mysema.query.*; import com.mysema.query.sql.H2Templates; public class H2WithQuotingTest extends AbstractSuite { @@ -18,13 +18,6 @@ public class H2WithQuotingTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initH2(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java index 7db0c4347..c7c571727 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/H2WithSchemaTest.java @@ -1,8 +1,8 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; +import com.mysema.query.*; import com.mysema.query.sql.H2Templates; public class H2WithSchemaTest extends AbstractSuite { @@ -18,13 +18,6 @@ public class H2WithSchemaTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initH2(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java new file mode 100644 index 000000000..41b61b152 --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbLiteralsSuiteTest.java @@ -0,0 +1,28 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; + +import com.mysema.query.*; +import com.mysema.query.sql.HSQLDBTemplates; + +public class HsqldbLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initHSQL(); + Connections.setTemplates(HSQLDBTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java index 7be607cff..69acb6063 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/HsqldbSuiteTest.java @@ -1,8 +1,8 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; +import com.mysema.query.*; import com.mysema.query.sql.HSQLDBTemplates; public class HsqldbSuiteTest extends AbstractSuite { @@ -18,13 +18,6 @@ public class HsqldbSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initHSQL(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java new file mode 100644 index 000000000..7d06f5690 --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLLiteralsSuiteTest.java @@ -0,0 +1,33 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.spatial.SQLServer2008SpatialTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class MSSQLLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Spatial extends SpatialBase {} + public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initSQLServer(); + Connections.setTemplates(SQLServer2008SpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java index 27268fd5a..3b0700074 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MSSQLSuiteTest.java @@ -1,9 +1,9 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; +import com.mysema.query.*; import com.mysema.query.sql.spatial.SQLServer2008SpatialTemplates; import com.mysema.testutil.ExternalDB; @@ -23,13 +23,6 @@ public class MSSQLSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initSQLServer(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java new file mode 100644 index 000000000..7cf33863f --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLLiteralsSuiteTest.java @@ -0,0 +1,34 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.spatial.MySQLSpatialTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class MySQLLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class KeywordQuoting extends KeywordQuotingBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class SelectMySQL extends SelectMySQLBase {} + public static class Spatial extends SpatialBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initMySQL(); + Connections.setTemplates(MySQLSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java index 4f887d879..e0c964205 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLSuiteTest.java @@ -1,12 +1,12 @@ package com.mysema.query.suites; +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + import com.mysema.query.*; import com.mysema.query.sql.spatial.MySQLSpatialTemplates; import com.mysema.testutil.ExternalDB; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; - @Category(ExternalDB.class) public class MySQLSuiteTest extends AbstractSuite { @@ -24,13 +24,6 @@ public class MySQLSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initMySQL(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java index 160b6a1ea..c923d3ad4 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/MySQLWithQuotingTest.java @@ -1,9 +1,9 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; +import com.mysema.query.*; import com.mysema.query.sql.spatial.MySQLSpatialTemplates; import com.mysema.testutil.ExternalDB; @@ -21,13 +21,6 @@ public class MySQLWithQuotingTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initMySQL(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java new file mode 100644 index 000000000..07c9617db --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleLiteralsSuiteTest.java @@ -0,0 +1,33 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.spatial.OracleSpatialTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class OracleLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class SelectOracle extends SelectOracleBase {} + public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initOracle(); + Connections.setTemplates(OracleSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java index 8b5732a6a..74a5f24fb 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleSuiteTest.java @@ -1,9 +1,9 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; +import com.mysema.query.*; import com.mysema.query.sql.spatial.OracleSpatialTemplates; import com.mysema.testutil.ExternalDB; @@ -23,13 +23,6 @@ public class OracleSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initOracle(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java index 1939db7fb..aec564a7f 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/OracleWithQuotingTest.java @@ -1,9 +1,9 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; +import com.mysema.query.*; import com.mysema.query.sql.OracleTemplates; import com.mysema.testutil.ExternalDB; @@ -21,13 +21,6 @@ public class OracleWithQuotingTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initOracle(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java new file mode 100644 index 000000000..a8b838646 --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLLiteralsSuiteTest.java @@ -0,0 +1,54 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.Configuration; +import com.mysema.query.sql.spatial.PostGISTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class PostgreSQLLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class KeywordQuoting extends KeywordQuotingBase { + + private Configuration previous; + + @Override + public void setUp() throws Exception { + //NOTE: replacing the templates with a non-quoting one + previous = configuration; + configuration = new Configuration(PostGISTemplates.builder().newLineToSingleSpace().build()); + super.setUp(); + } + + @Override + public void tearDown() throws Exception { + super.tearDown(); + //NOTE: restoring old templates + configuration = previous; + } + + } + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Spatial extends SpatialBase {} + public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initPostgres(); + Connections.setTemplates(PostGISTemplates.builder().quote().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java index 3f9c111da..4ae96b647 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/PostgreSQLSuiteTest.java @@ -1,13 +1,13 @@ package com.mysema.query.suites; +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + import com.mysema.query.*; import com.mysema.query.sql.Configuration; import com.mysema.query.sql.spatial.PostGISTemplates; import com.mysema.testutil.ExternalDB; -import org.junit.BeforeClass; -import org.junit.experimental.categories.Category; - @Category(ExternalDB.class) public class PostgreSQLSuiteTest extends AbstractSuite { @@ -44,13 +44,6 @@ public class PostgreSQLSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initPostgres(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java new file mode 100644 index 000000000..8de46e1bf --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteLiteralsSuiteTest.java @@ -0,0 +1,28 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; + +import com.mysema.query.*; +import com.mysema.query.sql.SQLiteTemplates; + +public class SQLiteLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initSQLite(); + Connections.setTemplates(SQLiteTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java index ac6cabe19..57f40a0cf 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/SQLiteSuiteTest.java @@ -1,8 +1,8 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; +import com.mysema.query.*; import com.mysema.query.sql.SQLiteTemplates; public class SQLiteSuiteTest extends AbstractSuite { @@ -18,13 +18,6 @@ public class SQLiteSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initSQLite(); diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java new file mode 100644 index 000000000..4cf6682bc --- /dev/null +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataLiteralsSuiteTest.java @@ -0,0 +1,34 @@ +package com.mysema.query.suites; + +import org.junit.BeforeClass; +import org.junit.experimental.categories.Category; + +import com.mysema.query.*; +import com.mysema.query.sql.spatial.TeradataSpatialTemplates; +import com.mysema.testutil.ExternalDB; + +@Category(ExternalDB.class) +public class TeradataLiteralsSuiteTest extends AbstractSuite { + + public static class BeanPopulation extends BeanPopulationBase {} + public static class Delete extends DeleteBase {} + public static class Insert extends InsertBase {} + public static class LikeEscape extends LikeEscapeBase {} + public static class Merge extends MergeBase {} + public static class Select extends SelectBase {} + public static class SelectTeradata extends SelectTeradataBase {} + public static class Spatial extends SpatialBase {} + public static class SelectWindowFunctions extends SelectWindowFunctionsBase {} + public static class Subqueries extends SubqueriesBase {} + public static class Types extends TypesBase {} + public static class Union extends UnionBase {} + public static class Update extends UpdateBase {} + + @BeforeClass + public static void setUp() throws Exception { + Connections.initTeradata(); + Connections.setTemplates(TeradataSpatialTemplates.builder().newLineToSingleSpace().build()); + Connections.getConfiguration().setUseLiterals(true); + } + +} diff --git a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java index db6c8b73d..b99e12dd9 100644 --- a/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java +++ b/querydsl-sql/src/test/java/com/mysema/query/suites/TeradataSuiteTest.java @@ -1,9 +1,9 @@ package com.mysema.query.suites; -import com.mysema.query.*; import org.junit.BeforeClass; import org.junit.experimental.categories.Category; +import com.mysema.query.*; import com.mysema.query.sql.spatial.TeradataSpatialTemplates; import com.mysema.testutil.ExternalDB; @@ -24,13 +24,6 @@ public class TeradataSuiteTest extends AbstractSuite { public static class Union extends UnionBase {} public static class Update extends UpdateBase {} - // with literals - public static class DeleteUseLiterals extends DeleteUseLiteralsBase {} - public static class InsertUseLiterals extends InsertUseLiteralsBase {} - public static class MergeUseLiterals extends MergeUseLiteralsBase {} - public static class SelectUseLiterals extends SelectUseLiteralsBase {} - public static class UpdateUseLiterals extends UpdateUseLiteralsBase {} - @BeforeClass public static void setUp() throws Exception { Connections.initTeradata();