Author: aadamchik
Date: Thu Mar 27 14:30:30 2014
New Revision: 1582322
URL: http://svn.apache.org/r1582322
Log:
CAY-1923 Optimize BatchTranslator - use fixed size array of
BatchParameterBinding
* renaming createSQLString to getSql
* making translator stateful to better deal with multiple objects involved -
SQL string, bindings, etc
Modified:
cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBInsertBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBUpdateBatchTranslator.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorTest.java
Modified:
cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
(original)
+++
cayenne/main/trunk/cayenne-crypto/src/main/java/org/apache/cayenne/crypto/batch/CryptoBatchTranslatorFactoryDecorator.java
Thu Mar 27 14:30:30 2014
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.crypto.batch;
-import java.io.IOException;
import java.util.List;
import org.apache.cayenne.access.translator.batch.BatchParameterBinding;
@@ -55,8 +54,8 @@ public class CryptoBatchTranslatorFactor
return new BatchTranslator() {
@Override
- public String createSqlString() throws IOException {
- return delegateTranslator.createSqlString();
+ public String getSql() {
+ return delegateTranslator.getSql();
}
@Override
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
Thu Mar 27 14:30:30 2014
@@ -100,7 +100,7 @@ public class BatchAction extends BaseSQL
protected void runAsBatch(Connection con, BatchTranslator translator,
OperationObserver delegate)
throws SQLException, Exception {
- String queryStr = translator.createSqlString();
+ String queryStr = translator.getSql();
JdbcEventLogger logger = dataNode.getJdbcEventLogger();
boolean isLoggable = logger.isLoggable();
@@ -158,7 +158,7 @@ public class BatchAction extends BaseSQL
JdbcEventLogger logger = dataNode.getJdbcEventLogger();
boolean useOptimisticLock = query.isUsingOptimisticLocking();
- String queryStr = translator.createSqlString();
+ String queryStr = translator.getSql();
// log batch SQL execution
logger.logQuery(queryStr, Collections.EMPTY_LIST);
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/BatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -19,7 +19,6 @@
package org.apache.cayenne.access.translator.batch;
-import java.io.IOException;
import java.util.List;
import org.apache.cayenne.query.BatchQueryRow;
@@ -32,10 +31,9 @@ import org.apache.cayenne.query.BatchQue
public interface BatchTranslator {
/**
- * Translates BatchQuery into an SQL string formatted to use in a
- * PreparedStatement.
+ * Returns SQL String that can be used to init a PreparedStatement.
*/
- String createSqlString() throws IOException;
+ String getSql();
/**
* Returns PreparedStatement bindings for a given row.
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.access.translator.batch;
-import java.io.IOException;
import java.sql.Types;
import java.util.List;
@@ -39,18 +38,33 @@ public abstract class DefaultBatchTransl
protected DbAdapter adapter;
protected String trimFunction;
+ protected boolean translated;
+ protected String sql;
+
public DefaultBatchTranslator(BatchQuery query, DbAdapter adapter, String
trimFunction) {
this.query = query;
this.adapter = adapter;
this.trimFunction = trimFunction;
}
+ protected void ensureTranslated() {
+ if (!translated) {
+ this.sql = createSql();
+ translated = true;
+ }
+ }
+
+ protected abstract String createSql();
+
/**
* Translates BatchQuery into an SQL string formatted to use in a
* PreparedStatement.
*/
@Override
- public abstract String createSqlString() throws IOException;
+ public String getSql() {
+ ensureTranslated();
+ return sql;
+ }
/**
* Returns PreparedStatement bindings for a given row.
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -19,7 +19,6 @@
package org.apache.cayenne.access.translator.batch;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -41,7 +40,7 @@ public class DeleteBatchTranslator exten
}
@Override
- public String createSqlString() throws IOException {
+ protected String createSql() {
QuotingStrategy strategy = adapter.getQuotingStrategy();
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -19,7 +19,6 @@
package org.apache.cayenne.access.translator.batch;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -63,7 +62,7 @@ public class InsertBatchTranslator exten
}
@Override
- public String createSqlString() throws IOException {
+ protected String createSql() {
List<DbAttribute> dbAttributes = query.getDbAttributes();
QuotingStrategy strategy = adapter.getQuotingStrategy();
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.access.translator.batch;
-import java.io.IOException;
import java.util.List;
import org.apache.cayenne.dba.DbAdapter;
@@ -42,7 +41,7 @@ public class SoftDeleteBatchTranslator e
}
@Override
- public String createSqlString() throws IOException {
+ protected String createSql() {
QuotingStrategy strategy = adapter.getQuotingStrategy();
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -19,7 +19,6 @@
package org.apache.cayenne.access.translator.batch;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -40,7 +39,7 @@ public class UpdateBatchTranslator exten
}
@Override
- public String createSqlString() throws IOException {
+ protected String createSql() {
UpdateBatchQuery updateBatch = (UpdateBatchQuery) query;
QuotingStrategy strategy = adapter.getQuotingStrategy();
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchAction.java
Thu Mar 27 14:30:30 2014
@@ -98,7 +98,7 @@ class Oracle8LOBBatchAction implements S
selectQuery.indexLOBAttributes(row);
int updated = 0;
- String updateStr = translator.createSqlString(row);
+ String updateStr = translator.createSql(row);
// 1. run row update
logger.logQuery(updateStr, Collections.EMPTY_LIST);
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -19,7 +19,6 @@
package org.apache.cayenne.dba.oracle;
-import java.io.IOException;
import java.sql.Types;
import java.util.ArrayList;
import java.util.Iterator;
@@ -50,10 +49,10 @@ abstract class Oracle8LOBBatchTranslator
abstract List<Object> getValuesForLOBUpdateParameters(BatchQueryRow row);
- abstract String createSqlString(BatchQueryRow row);
+ abstract String createSql(BatchQueryRow row);
@Override
- public final String createSqlString() throws IOException {
+ protected String createSql() {
throw new UnsupportedOperationException();
}
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBInsertBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBInsertBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBInsertBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBInsertBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -53,7 +53,7 @@ class Oracle8LOBInsertBatchTranslator ex
}
@Override
- public String createSqlString(BatchQueryRow row) {
+ public String createSql(BatchQueryRow row) {
List<DbAttribute> dbAttributes = query.getDbAttributes();
QuotingStrategy strategy = adapter.getQuotingStrategy();
Modified:
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBUpdateBatchTranslator.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBUpdateBatchTranslator.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBUpdateBatchTranslator.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/Oracle8LOBUpdateBatchTranslator.java
Thu Mar 27 14:30:30 2014
@@ -62,7 +62,7 @@ class Oracle8LOBUpdateBatchTranslator ex
}
@Override
- public String createSqlString(BatchQueryRow row) {
+ public String createSql(BatchQueryRow row) {
UpdateBatchQuery updateBatch = (UpdateBatchQuery) query;
List<DbAttribute> idDbAttributes =
updateBatch.getQualifierAttributes();
List<DbAttribute> updatedDbAttributes =
updateBatch.getUpdatedAttributes();
Modified:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorTest.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorTest.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DefaultBatchTranslatorTest.java
Thu Mar 27 14:30:30 2014
@@ -46,7 +46,7 @@ public class DefaultBatchTranslatorTest
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
DefaultBatchTranslator builder = new
DefaultBatchTranslator(mock(BatchQuery.class), adapter, null) {
@Override
- public String createSqlString() {
+ protected String createSql() {
return null;
}
@@ -64,8 +64,9 @@ public class DefaultBatchTranslatorTest
String trimFunction = "testTrim";
DefaultBatchTranslator builder = new
DefaultBatchTranslator(mock(BatchQuery.class), adapter, trimFunction) {
+
@Override
- public String createSqlString() {
+ protected String createSql() {
return null;
}
@@ -94,7 +95,7 @@ public class DefaultBatchTranslatorTest
DefaultBatchTranslator builder = new
DefaultBatchTranslator(mock(BatchQuery.class), adapter, null) {
@Override
- public String createSqlString() {
+ protected String createSql() {
return null;
}
Modified:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorTest.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorTest.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/DeleteBatchTranslatorTest.java
Thu Mar 27 14:30:30 2014
@@ -73,7 +73,7 @@ public class DeleteBatchTranslatorTest e
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
DeleteBatchTranslator builder = new DeleteBatchTranslator(deleteQuery,
adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("DELETE FROM " + entity.getName() + " WHERE
LOCKING_TEST_ID = ?", generatedSql);
}
@@ -91,7 +91,7 @@ public class DeleteBatchTranslatorTest e
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
DeleteBatchTranslator builder = new DeleteBatchTranslator(deleteQuery,
adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("DELETE FROM " + entity.getName() + " WHERE
LOCKING_TEST_ID = ? AND NAME IS NULL", generatedSql);
}
@@ -107,7 +107,7 @@ public class DeleteBatchTranslatorTest e
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity,
idAttributes, Collections.<String> emptySet(), 1);
JdbcAdapter adapter = (JdbcAdapter) this.adapter;
DeleteBatchTranslator builder = new
DeleteBatchTranslator(deleteQuery, adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
String charStart = unitAdapter.getIdentifiersStartQuote();
String charEnd = unitAdapter.getIdentifiersEndQuote();
@@ -138,7 +138,7 @@ public class DeleteBatchTranslatorTest e
JdbcAdapter adapter = (JdbcAdapter) this.adapter;
DeleteBatchTranslator builder = new
DeleteBatchTranslator(deleteQuery, adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
String charStart = unitAdapter.getIdentifiersStartQuote();
String charEnd = unitAdapter.getIdentifiersEndQuote();
Modified:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorTest.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorTest.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/InsertBatchTranslatorTest.java
Thu Mar 27 14:30:30 2014
@@ -63,7 +63,7 @@ public class InsertBatchTranslatorTest e
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
InsertBatchQuery insertQuery = new InsertBatchQuery(entity, 1);
InsertBatchTranslator builder = new InsertBatchTranslator(insertQuery,
adapter);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("INSERT INTO " + entity.getName() + " (DESCRIPTION,
LOCKING_TEST_ID, NAME) VALUES (?, ?, ?)",
generatedSql);
@@ -80,7 +80,7 @@ public class InsertBatchTranslatorTest e
InsertBatchQuery insertQuery = new InsertBatchQuery(entity, 1);
InsertBatchTranslator builder = new
InsertBatchTranslator(insertQuery, adapter);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
String charStart = unitAdapter.getIdentifiersStartQuote();
String charEnd = unitAdapter.getIdentifiersEndQuote();
assertNotNull(generatedSql);
Modified:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/SoftDeleteBatchTranslatorTest.java
Thu Mar 27 14:30:30 2014
@@ -79,7 +79,7 @@ public class SoftDeleteBatchTranslatorTe
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity,
idAttributes, Collections.<String> emptySet(), 1);
DeleteBatchTranslator builder = createTranslator(deleteQuery);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE
SOFT_TEST_ID = ?", generatedSql);
}
@@ -94,7 +94,7 @@ public class SoftDeleteBatchTranslatorTe
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity,
idAttributes, nullAttributes, 1);
DeleteBatchTranslator builder = createTranslator(deleteQuery);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("UPDATE " + entity.getName() + " SET DELETED = ? WHERE
SOFT_TEST_ID = ? AND NAME IS NULL",
generatedSql);
@@ -111,7 +111,7 @@ public class SoftDeleteBatchTranslatorTe
DeleteBatchQuery deleteQuery = new DeleteBatchQuery(entity,
idAttributes, Collections.<String> emptySet(), 1);
JdbcAdapter adapter = (JdbcAdapter) this.adapter;
DeleteBatchTranslator builder = createTranslator(deleteQuery,
adapter);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
String charStart = unitAdapter.getIdentifiersStartQuote();
String charEnd = unitAdapter.getIdentifiersEndQuote();
Modified:
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorTest.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorTest.java?rev=1582322&r1=1582321&r2=1582322&view=diff
==============================================================================
---
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorTest.java
(original)
+++
cayenne/main/trunk/cayenne-server/src/test/java/org/apache/cayenne/access/translator/batch/UpdateBatchTranslatorTest.java
Thu Mar 27 14:30:30 2014
@@ -72,7 +72,7 @@ public class UpdateBatchTranslatorTest e
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
UpdateBatchTranslator builder = new UpdateBatchTranslator(updateQuery,
adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("UPDATE " + entity.getName() + " SET DESCRIPTION = ?
WHERE LOCKING_TEST_ID = ?", generatedSql);
}
@@ -91,7 +91,7 @@ public class UpdateBatchTranslatorTest e
DbAdapter adapter = objectFactory.newInstance(DbAdapter.class,
JdbcAdapter.class.getName());
UpdateBatchTranslator builder = new UpdateBatchTranslator(updateQuery,
adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
assertEquals("UPDATE " + entity.getName() + " SET DESCRIPTION = ?
WHERE LOCKING_TEST_ID = ? AND NAME IS NULL",
@@ -112,7 +112,7 @@ public class UpdateBatchTranslatorTest e
JdbcAdapter adapter = (JdbcAdapter) this.adapter;
UpdateBatchTranslator builder = new
UpdateBatchTranslator(updateQuery, adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
String charStart = unitAdapter.getIdentifiersStartQuote();
String charEnd = unitAdapter.getIdentifiersEndQuote();
@@ -143,7 +143,7 @@ public class UpdateBatchTranslatorTest e
JdbcAdapter adapter = (JdbcAdapter) this.adapter;
UpdateBatchTranslator builder = new
UpdateBatchTranslator(updateQuery, adapter, null);
- String generatedSql = builder.createSqlString();
+ String generatedSql = builder.getSql();
assertNotNull(generatedSql);
String charStart = unitAdapter.getIdentifiersStartQuote();
