You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/03/05 09:21:53 UTC
[5/6] cayenne git commit: CAY-2050 Refactoring: ParameterBinding to
contain ExtendedType property
CAY-2050 Refactoring: ParameterBinding to contain ExtendedType property
* after some consideration, renaming Binding back to ParameterBinding
* minor import/formatting changes
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5bff2d59
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5bff2d59
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5bff2d59
Branch: refs/heads/master
Commit: 5bff2d599ed4f1c1e5b9a55baeb5d40507d27b24
Parents: 2d3f999
Author: Andrus Adamchik <an...@objectstyle.com>
Authored: Sat Mar 5 07:59:21 2016 +0300
Committer: Andrus Adamchik <an...@objectstyle.com>
Committed: Sat Mar 5 09:14:31 2016 +0100
----------------------------------------------------------------------
.../apache/cayenne/access/jdbc/BatchAction.java | 12 ++-
.../cayenne/access/jdbc/SQLTemplateAction.java | 35 ++++---
.../cayenne/access/translator/Binding.java | 99 --------------------
.../access/translator/DbAttributeBinding.java | 4 +-
.../access/translator/ParameterBinding.java | 99 ++++++++++++++++++++
.../translator/ProcedureParameterBinding.java | 2 +-
.../org/apache/cayenne/dba/AutoAdapter.java | 4 +-
.../java/org/apache/cayenne/dba/DbAdapter.java | 4 +-
.../org/apache/cayenne/dba/JdbcAdapter.java | 4 +-
.../org/apache/cayenne/dba/db2/DB2Adapter.java | 4 +-
.../apache/cayenne/dba/derby/DerbyAdapter.java | 4 +-
.../cayenne/dba/ingres/IngresAdapter.java | 4 +-
.../apache/cayenne/dba/mysql/MySQLAdapter.java | 4 +-
.../cayenne/dba/oracle/OracleAdapter.java | 4 +-
.../cayenne/dba/postgres/PostgresAdapter.java | 4 +-
.../cayenne/dba/sybase/SybaseAdapter.java | 4 +-
16 files changed, 153 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
index 7746823..a97bc78 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/BatchAction.java
@@ -19,6 +19,14 @@
package org.apache.cayenne.access.jdbc;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Collection;
+import java.util.Collections;
+
import org.apache.cayenne.CayenneException;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.access.DataNode;
@@ -36,10 +44,6 @@ import org.apache.cayenne.query.BatchQuery;
import org.apache.cayenne.query.BatchQueryRow;
import org.apache.cayenne.query.InsertBatchQuery;
-import java.sql.*;
-import java.util.Collection;
-import java.util.Collections;
-
/**
* @since 1.2
*/
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
index 0f9ac47..645aa46 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/jdbc/SQLTemplateAction.java
@@ -19,13 +19,26 @@
package org.apache.cayenne.access.jdbc;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
import org.apache.cayenne.CayenneException;
import org.apache.cayenne.DataRow;
import org.apache.cayenne.ResultIterator;
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.OperationObserver;
import org.apache.cayenne.access.jdbc.reader.RowReader;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.types.ExtendedType;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.dba.DbAdapter;
@@ -40,9 +53,6 @@ import org.apache.cayenne.query.SQLTemplate;
import org.apache.cayenne.util.Util;
import org.apache.commons.collections.IteratorUtils;
-import java.sql.*;
-import java.util.*;
-
/**
* Implements a strategy for execution of SQLTemplates.
*
@@ -141,8 +151,8 @@ public class SQLTemplateAction implements SQLAction {
// for now supporting deprecated batch parameters...
@SuppressWarnings("unchecked")
- Iterator<Map<String, ?>> it = (size > 0) ? query.parametersIterator() : IteratorUtils
- .singletonIterator(Collections.emptyMap());
+ Iterator<Map<String, ?>> it = (size > 0) ? query.parametersIterator()
+ : IteratorUtils.singletonIterator(Collections.emptyMap());
for (int i = 0; i < batchSize; i++) {
Map<String, ?> nextParameters = it.next();
@@ -335,18 +345,19 @@ public class SQLTemplateAction implements SQLAction {
/**
* Binds parameters to the PreparedStatement.
*/
- protected void bind(PreparedStatement preparedStatement, SQLParameterBinding[] bindings) throws SQLException,
- Exception {
+ protected void bind(PreparedStatement preparedStatement, SQLParameterBinding[] bindings)
+ throws SQLException, Exception {
// bind parameters
if (bindings.length > 0) {
int len = bindings.length;
for (int i = 0; i < len; i++) {
ExtendedType extendedType = getAdapter().getExtendedTypes().getDefaultType();
- if (bindings[i].getValue() != null) getAdapter().getExtendedTypes().getRegisteredType(bindings[i]
- .getValue().getClass());
- Binding binding = new Binding(extendedType);
+ if (bindings[i].getValue() != null) {
+ getAdapter().getExtendedTypes().getRegisteredType(bindings[i].getValue().getClass());
+ }
+ ParameterBinding binding = new ParameterBinding(extendedType);
binding.setType(bindings[i].getJdbcType());
- binding.setStatementPosition(i+1);
+ binding.setStatementPosition(i + 1);
binding.setValue(bindings[i].getValue());
dataNode.getAdapter().bindParameter(preparedStatement, binding);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/access/translator/Binding.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/Binding.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/Binding.java
deleted file mode 100644
index 369f5cc..0000000
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/Binding.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you 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 org.apache.cayenne.access.translator;
-
-import org.apache.cayenne.access.types.ExtendedType;
-
-/**
- * Describes a PreparedStatement parameter generic binding.
- *
- * @since 4.0
- */
-public class Binding {
-
- static final int EXCLUDED_POSITION = -1;
-
- private Object value;
- private int statementPosition;
- private ExtendedType extendedType;
- private Integer type;
- private int scale;
-
- public Binding(ExtendedType extendedType) {
- this.statementPosition = EXCLUDED_POSITION;
- this.extendedType = extendedType;
- }
-
- public Object getValue() {
- return value;
- }
-
- public void setValue(Object value) {
- this.value = value;
- }
-
- public int getStatementPosition() {
- return statementPosition;
- }
-
- public void setStatementPosition(int statementPosition) {
- this.statementPosition = statementPosition;
- }
-
- public boolean isExcluded() {
- return statementPosition == EXCLUDED_POSITION;
- }
-
- public ExtendedType getExtendedType() {
- return extendedType;
- }
-
- /**
- * Marks the binding object as excluded for the current iteration.
- */
- public void exclude() {
- this.statementPosition = EXCLUDED_POSITION;
- this.value = null;
- }
-
- /**
- * Sets the value of the binding and initializes statement position var,
- * thus "including" this binding in the current iteration.
- */
- public void include(int statementPosition, Object value) {
- this.statementPosition = statementPosition;
- this.value = value;
- }
-
- public Integer getType() {
- return type;
- }
-
- public void setType(Integer type) {
- this.type = type;
- }
-
- public int getScale() {
- return scale;
- }
-
- public void setScale(int scale) {
- this.scale = scale;
- }
-}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/access/translator/DbAttributeBinding.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/DbAttributeBinding.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/DbAttributeBinding.java
index 05c40ab..523c473 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/DbAttributeBinding.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/DbAttributeBinding.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.DbAttribute;
*
* @since 4.0
*/
-public class DbAttributeBinding extends Binding{
+public class DbAttributeBinding extends ParameterBinding {
private final DbAttribute attribute;
@@ -45,7 +45,7 @@ public class DbAttributeBinding extends Binding{
}
@Override
- public int getScale() {
+ public int getScale() {
return getAttribute().getScale();
}
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ParameterBinding.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ParameterBinding.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ParameterBinding.java
new file mode 100644
index 0000000..8ef6b28
--- /dev/null
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ParameterBinding.java
@@ -0,0 +1,99 @@
+/*****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cayenne.access.translator;
+
+import org.apache.cayenne.access.types.ExtendedType;
+
+/**
+ * Describes a PreparedStatement parameter generic binding.
+ *
+ * @since 4.0
+ */
+public class ParameterBinding {
+
+ static final int EXCLUDED_POSITION = -1;
+
+ private Object value;
+ private int statementPosition;
+ private ExtendedType extendedType;
+ private Integer type;
+ private int scale;
+
+ public ParameterBinding(ExtendedType extendedType) {
+ this.statementPosition = EXCLUDED_POSITION;
+ this.extendedType = extendedType;
+ }
+
+ public Object getValue() {
+ return value;
+ }
+
+ public void setValue(Object value) {
+ this.value = value;
+ }
+
+ public int getStatementPosition() {
+ return statementPosition;
+ }
+
+ public void setStatementPosition(int statementPosition) {
+ this.statementPosition = statementPosition;
+ }
+
+ public boolean isExcluded() {
+ return statementPosition == EXCLUDED_POSITION;
+ }
+
+ public ExtendedType getExtendedType() {
+ return extendedType;
+ }
+
+ /**
+ * Marks the binding object as excluded for the current iteration.
+ */
+ public void exclude() {
+ this.statementPosition = EXCLUDED_POSITION;
+ this.value = null;
+ }
+
+ /**
+ * Sets the value of the binding and initializes statement position var,
+ * thus "including" this binding in the current iteration.
+ */
+ public void include(int statementPosition, Object value) {
+ this.statementPosition = statementPosition;
+ this.value = value;
+ }
+
+ public Integer getType() {
+ return type;
+ }
+
+ public void setType(Integer type) {
+ this.type = type;
+ }
+
+ public int getScale() {
+ return scale;
+ }
+
+ public void setScale(int scale) {
+ this.scale = scale;
+ }
+}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ProcedureParameterBinding.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ProcedureParameterBinding.java b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ProcedureParameterBinding.java
index 1294b86..df15c96 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ProcedureParameterBinding.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/access/translator/ProcedureParameterBinding.java
@@ -26,7 +26,7 @@ import org.apache.cayenne.map.ProcedureParameter;
*
* @since 4.0
*/
-public class ProcedureParameterBinding extends Binding {
+public class ProcedureParameterBinding extends ParameterBinding {
private final ProcedureParameter parameter;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
index f3fb80c..a8876f6 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/AutoAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
import org.apache.cayenne.access.translator.select.QueryAssembler;
@@ -200,7 +200,7 @@ public class AutoAdapter implements DbAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding parameterBinding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding parameterBinding)
throws SQLException, Exception {
getAdapter().bindParameter(statement, parameterBinding);
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
index 4fbaa3d..d72bc31 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/DbAdapter.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
import org.apache.cayenne.access.translator.select.QueryAssembler;
@@ -168,7 +168,7 @@ public interface DbAdapter {
/**
* Binds an object value to PreparedStatement's parameter.
*/
- void bindParameter(PreparedStatement statement, Binding parameterBinding) throws SQLException, Exception;
+ void bindParameter(PreparedStatement statement, ParameterBinding parameterBinding) throws SQLException, Exception;
/**
* Returns the name of the table type (as returned by
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
index 4cf88eb..57d3430 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/JdbcAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.batch.BatchTranslatorFactory;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
@@ -536,7 +536,7 @@ public class JdbcAdapter implements DbAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding binding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding binding)
throws SQLException, Exception {
if (binding.getValue() == null) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
index d917a46..f71f655 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/db2/DB2Adapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba.db2;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
import org.apache.cayenne.access.translator.select.QueryAssembler;
import org.apache.cayenne.access.types.*;
@@ -229,7 +229,7 @@ public class DB2Adapter extends JdbcAdapter {
@Override
public void bindParameter(
- PreparedStatement statement, Binding binding) throws SQLException, Exception {
+ PreparedStatement statement, ParameterBinding binding) throws SQLException, Exception {
if (binding.getValue() == null && (binding.getType() == 0 || binding.getType() == Types.BOOLEAN)) {
statement.setNull(binding.getStatementPosition(), Types.VARCHAR);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
index 05b7d3b..8a3b462 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/derby/DerbyAdapter.java
@@ -20,7 +20,7 @@
package org.apache.cayenne.dba.derby;
import org.apache.cayenne.CayenneRuntimeException;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
@@ -187,7 +187,7 @@ public class DerbyAdapter extends JdbcAdapter {
@Override
public void bindParameter(
PreparedStatement statement,
- Binding binding) throws SQLException, Exception {
+ ParameterBinding binding) throws SQLException, Exception {
if (binding.getValue() == null && binding.getType() == 0) {
statement.setNull(binding.getStatementPosition(), Types.VARCHAR);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
index 7605bcf..d9aee83 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/ingres/IngresAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba.ingres;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
import org.apache.cayenne.access.translator.select.QueryAssembler;
import org.apache.cayenne.access.translator.select.SelectTranslator;
@@ -110,7 +110,7 @@ public class IngresAdapter extends JdbcAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding binding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding binding)
throws SQLException, Exception {
if (binding.getValue() == null && (binding.getType() == Types.BOOLEAN || binding.getType() == Types.BIT)) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
index 5bbb17b..961f653 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/mysql/MySQLAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba.mysql;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.ejbql.JdbcEJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
@@ -202,7 +202,7 @@ public class MySQLAdapter extends JdbcAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding binding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding binding)
throws SQLException, Exception {
binding.setType(mapNTypes(binding.getType()));
super.bindParameter(statement, binding);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
index d93d91d..adfd6dd 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/oracle/OracleAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba.oracle;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
import org.apache.cayenne.access.translator.select.QueryAssembler;
@@ -218,7 +218,7 @@ public class OracleAdapter extends JdbcAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding binding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding binding)
throws SQLException, Exception {
// Oracle doesn't support BOOLEAN even when binding NULL, so have to
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
index 5e61b89..e4c7eff 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/postgres/PostgresAdapter.java
@@ -21,7 +21,7 @@ package org.apache.cayenne.dba.postgres;
import org.apache.cayenne.CayenneRuntimeException;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.select.QualifierTranslator;
import org.apache.cayenne.access.translator.select.QueryAssembler;
import org.apache.cayenne.access.translator.select.SelectTranslator;
@@ -131,7 +131,7 @@ public class PostgresAdapter extends JdbcAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding binding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding binding)
throws SQLException, Exception {
binding.setType(mapNTypes(binding.getType()));
super.bindParameter(statement, binding);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/5bff2d59/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
----------------------------------------------------------------------
diff --git a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
index e31fd50..2b0ca86 100644
--- a/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
+++ b/cayenne-server/src/main/java/org/apache/cayenne/dba/sybase/SybaseAdapter.java
@@ -19,7 +19,7 @@
package org.apache.cayenne.dba.sybase;
-import org.apache.cayenne.access.translator.Binding;
+import org.apache.cayenne.access.translator.ParameterBinding;
import org.apache.cayenne.access.translator.ejbql.EJBQLTranslatorFactory;
import org.apache.cayenne.access.types.*;
import org.apache.cayenne.configuration.Constants;
@@ -104,7 +104,7 @@ public class SybaseAdapter extends JdbcAdapter {
}
@Override
- public void bindParameter(PreparedStatement statement, Binding binding)
+ public void bindParameter(PreparedStatement statement, ParameterBinding binding)
throws SQLException, Exception {
// Sybase driver doesn't like CLOBs and BLOBs as parameters