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

[aadamchik]

Author: aadamchik
Date: Thu Nov 15 19:48:02 2012
New Revision: 1409954

URL: http://svn.apache.org/viewvc?rev=1409954&view=rev
Log:
CAY-1772  Real support for DbEntity catalogs

adding catalog to PK generator sequences

Modified:
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
    
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/db2/DB2PkGenerator.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java?rev=1409954&r1=1409953&r2=1409954&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/dba/db2/DB2PkGenerator.java
 Thu Nov 15 19:48:02 2012
@@ -187,7 +187,7 @@ public class DB2PkGenerator extends Jdbc
         String entName = entity.getName();
         String seqName = _SEQUENCE_PREFIX + entName;
 
-        return context.quotedIdentifier(entity.getSchema(), seqName);
+        return context.quotedIdentifier(entity.getCatalog(), 
entity.getSchema(), seqName);
     }
 
     /**

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=1409954&r1=1409953&r2=1409954&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
 Thu Nov 15 19:48:02 2012
@@ -221,7 +221,7 @@ public class OraclePkGenerator extends J
             String entName = entity.getName();
             String seqName = _SEQUENCE_PREFIX + entName.toLowerCase();
 
-            return context.quotedIdentifier(entity.getSchema(), seqName);
+            return context.quotedIdentifier(entity.getCatalog(), 
entity.getSchema(), seqName);
         }
     }