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 2008/01/16 14:13:30 UTC
svn commit: r612444 - in
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite:
SQLiteAdapter.java SQLiteSQLTemplateAction.java
Author: torehalset
Date: Wed Jan 16 05:13:29 2008
New Revision: 612444
URL: http://svn.apache.org/viewvc?rev=612444&view=rev
Log:
generics
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java?rev=612444&r1=612443&r2=612444&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteAdapter.java Wed Jan 16 05:13:29 2008
@@ -25,6 +25,7 @@
import org.apache.cayenne.access.DataNode;
import org.apache.cayenne.access.types.ExtendedTypeMap;
import org.apache.cayenne.dba.JdbcAdapter;
+import org.apache.cayenne.map.DbAttribute;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.query.Query;
@@ -64,7 +65,7 @@
}
@Override
- public String createUniqueConstraint(DbEntity source, Collection columns) {
+ public String createUniqueConstraint(DbEntity source, Collection<DbAttribute> columns) {
// TODO: andrus 10/9/2007 - only ALTER TABLE ADD CONSTRAINT is not supported,
// presumably there's some other syntax (a part of CREATE TABLE?) that would
// create a unique constraint.
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java?rev=612444&r1=612443&r2=612444&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/sqlite/SQLiteSQLTemplateAction.java Wed Jan 16 05:13:29 2008
@@ -51,7 +51,7 @@
Connection connection,
OperationObserver callback,
SQLStatement compiled,
- Collection updateCounts) throws SQLException, Exception {
+ Collection<Number> updateCounts) throws SQLException, Exception {
String sql = compiled.getSql().trim();
boolean select = sql.length() > "SELECT".length()