Reorganize use literals tests

This commit is contained in:
Timo Westkämper 2014-12-20 22:51:03 +02:00
parent b4c137e9dd
commit 9707e88069
40 changed files with 447 additions and 227 deletions

View File

@ -510,8 +510,8 @@
<excludedGroups>com.mysema.testutil.DummyInterface</excludedGroups>
<excludes>
<exclude>**/*$*</exclude>
<exclude>**/MSSQLSuiteTest.java</exclude>
<exclude>**/TeradataSuiteTest.java</exclude>
<exclude>**/MSSQL*SuiteTest.java</exclude>
<exclude>**/Teradata*SuiteTest.java</exclude>
</excludes>
</configuration>
</plugin>
@ -532,10 +532,10 @@
<exclude>**/*$*</exclude>
<exclude>**/ExportOracleTest.java</exclude>
<exclude>**/ExportTeradataTest.java</exclude>
<exclude>**/OracleSuiteTest.java</exclude>
<exclude>**/Oracle*SuiteTest.java</exclude>
<exclude>**/OracleWithQuotingTest.java</exclude>
<exclude>**/MSSQLSuiteTest.java</exclude>
<exclude>**/TeradataSuiteTest.java</exclude>
<exclude>**/MSSQL*SuiteTest.java</exclude>
<exclude>**/Teradata*SuiteTest.java</exclude>
</excludes>
<properties>
<property>

View File

@ -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);
}
}
}

View File

@ -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<Geometry> {
@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);
}
}

View File

@ -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<Geometry> {
@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);
}
}

View File

@ -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<Geometry> {
@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);
}
}

View File

@ -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);
}
}
}

View File

@ -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<Geometry> {
@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);
}
}

View File

@ -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;

View File

@ -36,7 +36,7 @@ public final class Connections {
private static ThreadLocal<Target> targetHolder = new ThreadLocal<Target>();
private static ThreadLocal<SQLTemplates> templatesHolder = new ThreadLocal<SQLTemplates>();
private static ThreadLocal<Configuration> configurationHolder = new ThreadLocal<Configuration>();
// 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 {

View File

@ -1,9 +0,0 @@
package com.mysema.query;
public class DeleteUseLiteralsBase extends DeleteBase {
public DeleteUseLiteralsBase() {
configuration.setUseLiterals(true);
}
}

View File

@ -1,9 +0,0 @@
package com.mysema.query;
public class InsertUseLiteralsBase extends InsertBase {
public InsertUseLiteralsBase() {
configuration.setUseLiterals(true);
}
}

View File

@ -1,9 +0,0 @@
package com.mysema.query;
public class MergeUseLiteralsBase extends MergeBase {
public MergeUseLiteralsBase() {
configuration.setUseLiterals(true);
}
}

View File

@ -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
}
}

View File

@ -1,9 +0,0 @@
package com.mysema.query;
public class UpdateUseLiteralsBase extends UpdateBase {
public UpdateUseLiteralsBase() {
configuration.setUseLiterals(true);
}
}

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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();

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();

View File

@ -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);
}
}

View File

@ -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();