You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by to...@apache.org on 2009/09/10 10:58:11 UTC
svn commit: r813318 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge:
ExecutingMergerContext.java MergerContext.java
Author: torehalset
Date: Thu Sep 10 08:58:11 2009
New Revision: 813318
URL: http://svn.apache.org/viewvc?rev=813318&view=rev
Log:
Removed executeSql(String sql) from MergerContext as it is not longer in use internally. Externally, some might have implemented this method to collect/inspect SQL-statements, but they should use AbstractToDbToken.createSql instead.
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/ExecutingMergerContext.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerContext.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/ExecutingMergerContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/ExecutingMergerContext.java?rev=813318&r1=813317&r2=813318&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/ExecutingMergerContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/ExecutingMergerContext.java Thu Sep 10 08:58:11 2009
@@ -18,17 +18,11 @@
****************************************************************/
package org.apache.cayenne.merge;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
import javax.sql.DataSource;
import org.apache.cayenne.access.DataNode;
-import org.apache.cayenne.access.QueryLogger;
import org.apache.cayenne.dba.DbAdapter;
import org.apache.cayenne.map.DataMap;
-import org.apache.cayenne.validation.SimpleValidationFailure;
import org.apache.cayenne.validation.ValidationResult;
public class ExecutingMergerContext implements MergerContext {
@@ -55,38 +49,6 @@
this.delegate = delegate;
}
- @Deprecated
- public void executeSql(String sql) {
- Connection conn = null;
- Statement st = null;
- try {
- QueryLogger.log(sql);
- conn = getDataNode().getDataSource().getConnection();
- st = conn.createStatement();
- st.execute(sql);
- }
- catch (SQLException e) {
- result.addFailure(new SimpleValidationFailure(sql, e.getMessage()));
- QueryLogger.logQueryError(e);
- }
- finally {
- if (st != null) {
- try {
- st.close();
- }
- catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- }
- catch (SQLException e) {
- }
- }
- }
- }
-
public DbAdapter getAdapter() {
return getDataNode().getAdapter();
}
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerContext.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerContext.java?rev=813318&r1=813317&r2=813318&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerContext.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/merge/MergerContext.java Thu Sep 10 08:58:11 2009
@@ -30,9 +30,6 @@
*/
public interface MergerContext {
- @Deprecated
- public void executeSql(String sql);
-
public ModelMergeDelegate getModelMergeDelegate();
public DbAdapter getAdapter();