Author: aadamchik
Date: Fri Nov 16 08:13:46 2012
New Revision: 1410241
URL: http://svn.apache.org/viewvc?rev=1410241&view=rev
Log:
CAY-1772 Real support for DbEntity catalogs
missed catalog in PK reeng
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
URL:
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java?rev=1410241&r1=1410240&r2=1410241&view=diff
==============================================================================
---
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
(original)
+++
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/DbLoader.java
Fri Nov 16 08:13:46 2012
@@ -468,7 +468,7 @@ public class DbLoader {
for (final DbEntity dbEntity : map.getDbEntities()) {
if (tables.contains(dbEntity)) {
String tableName = dbEntity.getName();
- ResultSet rs = metaData.getPrimaryKeys(null,
+ ResultSet rs = metaData.getPrimaryKeys(dbEntity.getCatalog(),
dbEntity.getSchema(), tableName);
try {
while (rs.next()) {
