svn commit: r1297508 - in /cayenne/main/trunk: docs/doc/src/main/resources/RELEASE-NOTES.txt framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/SchemaAnalyzer.java

[oltka]

Author: oltka
Date: Tue Mar  6 14:56:37 2012
New Revision: 1297508

URL: http://svn.apache.org/viewvc?rev=1297508&view=rev
Log:
CAY-1650 Verify existence of tables if a default schema is specified

Modified:
    cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
    
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/SchemaAnalyzer.java

Modified: cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt?rev=1297508&r1=1297507&r2=1297508&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/RELEASE-NOTES.txt Tue Mar  6 
14:56:37 2012
@@ -28,6 +28,7 @@ CAY-1640 NullPointerException when savin
 CAY-1642 [PATCH] add ability to customize connection "timeout" setting for ROP
 CAY-1643 Updated Velocity templates to use static keys in setters/getters
 CAY-1649 Use BOOLEAN data type on Derby. Require Derby version >= 10.7.1.1.
+CAY-1650 [PATCH] Verify existence of tables if a default schema is specified
 CAY-1651 ObjectContext.localObject - defer FaultFailureExceptions on temporary 
IDs
 CAY-1653 Improving DefaultEventManager concurrency - non-bocking DispatchQueue
 CAY-1654 Can't switch DataSource Factory on certain projects

Modified: 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/SchemaAnalyzer.java
URL: 
http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/SchemaAnalyzer.java?rev=1297508&r1=1297507&r2=1297508&view=diff
==============================================================================
--- 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/SchemaAnalyzer.java
 (original)
+++ 
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/access/dbsync/SchemaAnalyzer.java
 Tue Mar  6 14:56:37 2012
@@ -119,9 +119,13 @@ class SchemaAnalyzer {
 
             if (schema != null) {
                 if (schemaNameMap.get(schema) != null) {
-
-                }
-                else {
+                    Collection<String> names = schemaNameMap.get(schema);
+                    if (names.contains(name)) {
+                         mapTableInDB.put(name, schema);
+                    } else {
+                        tableNoInDB.add(name);
+                    }
+                } else {
                     isIncluded = false;
                     errorMessage = "no schema " + schema + " in db";
                     break;