svn commit: r1102457 - in /openjpa/branches/2.1.x/openjpa-jdbc/src: main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java

[mikedd]

Author: mikedd
Date: Thu May 12 20:57:05 2011
New Revision: 1102457

URL: http://svn.apache.org/viewvc?rev=1102457&view=rev
Log:
OPENJPA-1725: preserve original behavior in 2.1.x.

Modified:
    
openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
    
openjpa/branches/2.1.x/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java

Modified: 
openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java?rev=1102457&r1=1102456&r2=1102457&view=diff
==============================================================================
--- 
openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
 (original)
+++ 
openjpa/branches/2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
 Thu May 12 20:57:05 2011
@@ -337,7 +337,7 @@ public class DBDictionary
     public boolean supportsNullTableForGetImportedKeys = false;
     public boolean useGetBestRowIdentifierForPrimaryKeys = false;
     public boolean requiresAutoCommitForMetaData = false;
-    public boolean tableLengthIncludesSchema = false; 
+    public boolean tableLengthIncludesSchema = true; 
 
     // auto-increment
     public int maxAutoAssignNameLength = 31;

Modified: 
openjpa/branches/2.1.x/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java?rev=1102457&r1=1102456&r2=1102457&view=diff
==============================================================================
--- 
openjpa/branches/2.1.x/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java
 (original)
+++ 
openjpa/branches/2.1.x/openjpa-jdbc/src/test/java/org/apache/openjpa/jdbc/sql/TestDBDictionaryGeneratedSQL.java
 Thu May 12 20:57:05 2011
@@ -42,6 +42,7 @@ public class TestDBDictionaryGeneratedSQ
         });
         
         DBDictionary dict = new DBDictionary();
+        dict.tableLengthIncludesSchema=false; 
         dict.setConfiguration(mockConfiguration);
         dict.maxTableNameLength = 10;
 
@@ -73,6 +74,7 @@ public class TestDBDictionaryGeneratedSQ
         
         DBDictionary dict = new DBDictionary();
         dict.setConfiguration(mockConfiguration);
+        dict.tableLengthIncludesSchema=false; 
         dict.maxTableNameLength = 10;
 
         Table table = new Table();
@@ -103,6 +105,7 @@ public class TestDBDictionaryGeneratedSQ
         
         DBDictionary dict = new DBDictionary();
         dict.setConfiguration(mockConfiguration);
+        dict.tableLengthIncludesSchema=false; 
         dict.maxTableNameLength = 12;
 
         Table table = new Table();