openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwsut...@apache.org
Subject svn commit: r582838 - in /openjpa: branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Date Mon, 08 Oct 2007 14:41:17 GMT
Author: kwsutter
Date: Mon Oct  8 07:41:14 2007
New Revision: 582838

URL: http://svn.apache.org/viewvc?rev=582838&view=rev
Log:
OPENJPA-395.  Use getShort instead of getInt for the KEY_SEQ, DEFFERABILITY, and DELETE_RULE
metadata fields.

Modified:
    openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
    openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java

Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=582838&r1=582837&r2=582838&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
(original)
+++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Mon Oct  8 07:41:14 2007
@@ -3621,11 +3621,11 @@
         fk.setPrimaryKeySchemaName(fkMeta.getString("PKTABLE_SCHEM"));
         fk.setPrimaryKeyTableName(fkMeta.getString("PKTABLE_NAME"));
         fk.setPrimaryKeyColumnName(fkMeta.getString("PKCOLUMN_NAME"));
-        fk.setKeySequence(fkMeta.getInt("KEY_SEQ"));
-        fk.setDeferred(fkMeta.getInt("DEFERRABILITY")
+        fk.setKeySequence(fkMeta.getShort("KEY_SEQ"));
+        fk.setDeferred(fkMeta.getShort("DEFERRABILITY")
             == DatabaseMetaData.importedKeyInitiallyDeferred);
 
-        int del = fkMeta.getInt("DELETE_RULE");
+        int del = fkMeta.getShort("DELETE_RULE");
         switch (del) {
             case DatabaseMetaData.importedKeySetNull:
                 fk.setDeleteAction(ForeignKey.ACTION_NULL);

Modified: openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=582838&r1=582837&r2=582838&view=diff
==============================================================================
--- openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
(original)
+++ openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
Mon Oct  8 07:41:14 2007
@@ -3644,11 +3644,11 @@
         fk.setPrimaryKeySchemaName(fkMeta.getString("PKTABLE_SCHEM"));
         fk.setPrimaryKeyTableName(fkMeta.getString("PKTABLE_NAME"));
         fk.setPrimaryKeyColumnName(fkMeta.getString("PKCOLUMN_NAME"));
-        fk.setKeySequence(fkMeta.getInt("KEY_SEQ"));
-        fk.setDeferred(fkMeta.getInt("DEFERRABILITY")
+        fk.setKeySequence(fkMeta.getShort("KEY_SEQ"));
+        fk.setDeferred(fkMeta.getShort("DEFERRABILITY")
             == DatabaseMetaData.importedKeyInitiallyDeferred);
 
-        int del = fkMeta.getInt("DELETE_RULE");
+        int del = fkMeta.getShort("DELETE_RULE");
         switch (del) {
             case DatabaseMetaData.importedKeySetNull:
                 fk.setDeleteAction(ForeignKey.ACTION_NULL);



Mime
View raw message