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 2009/04/13 21:34:54 UTC

svn commit: r764578 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java

Author: aadamchik
Date: Mon Apr 13 19:34:54 2009
New Revision: 764578

URL: http://svn.apache.org/viewvc?rev=764578&view=rev
Log:
CAY-289 Implement Quoting of identifiers

the last patch by Olga fixing things for Oracle (ErrorInOracle.txt)

Modified:
    cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java

Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java?rev=764578&r1=764577&r2=764578&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/oracle/OraclePkGenerator.java Mon Apr 13 19:34:54 2009
@@ -34,6 +34,7 @@
 import org.apache.cayenne.dba.QuotingStrategy;
 import org.apache.cayenne.dba.JdbcAdapter;
 import org.apache.cayenne.dba.JdbcPkGenerator;
+import org.apache.cayenne.map.DataMap;
 import org.apache.cayenne.map.DbEntity;
 import org.apache.cayenne.map.DbKeyGenerator;
 
@@ -102,9 +103,20 @@
         Iterator it = dbEntities.iterator();
         while (it.hasNext()) {
             DbEntity ent = (DbEntity) it.next();
-            if (sequences.contains(stripSchemaName(sequenceName(ent)))) {
+            String name;
+            if(ent.getDataMap().isQuotingSQLIdentifiers()){
+                DbEntity tempEnt = new DbEntity();
+                DataMap dm = new DataMap();                
+                dm.setQuotingSQLIdentifiers(false);
+                tempEnt.setDataMap(dm);
+                tempEnt.setName(ent.getName());
+                name = stripSchemaName(sequenceName(tempEnt));
+            } else {
+                name = stripSchemaName(sequenceName(ent));
+            }           
+            if (sequences.contains(name)) {
                 runUpdate(node, dropSequenceString(ent));
-            }
+            } 
         }
     }