db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bpendle...@apache.org
Subject svn commit: r706047 - in /db/derby/code/branches/10.4/java: engine/org/apache/derby/impl/sql/compile/CreateTableNode.java testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
Date Sun, 19 Oct 2008 17:57:50 GMT
Author: bpendleton
Date: Sun Oct 19 10:57:49 2008
New Revision: 706047

URL: http://svn.apache.org/viewvc?rev=706047&view=rev
Log:
DERBY-3043: Schema does not exist error when table uses check constraint

Merged from the trunk by svn merge -r 705886:705887

Simple merge with no conflicts; no additional changes were necessary.


Modified:
    db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
    db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java

Modified: db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java?rev=706047&r1=706046&r2=706047&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
(original)
+++ db/derby/code/branches/10.4/java/engine/org/apache/derby/impl/sql/compile/CreateTableNode.java
Sun Oct 19 10:57:49 2008
@@ -427,10 +427,18 @@
 									C_NodeTypes.FROM_LIST,
 									getNodeFactory().doJoinOrderOptimization(),
 									getContextManager());
+			// DERBY-3043: To avoid a no-such-schema error when
+			// binding the check constraint, ensure that the
+			// table we bind against has a schema name specified.
+			// If it doesn't, fill in the schema name now.
+			//
+			TableName newTN = getObjectName();
+			if (newTN.getSchemaName() == null)
+				newTN.setSchemaName(getSchemaDescriptor().getSchemaName());
 			FromBaseTable table = (FromBaseTable)
 									getNodeFactory().getNode(
 										C_NodeTypes.FROM_BASE_TABLE,
-										getObjectName(),
+										newTN,
 										null,
 										null,
 										null,

Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java?rev=706047&r1=706046&r2=706047&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
(original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/lang/LazyDefaultSchemaCreationTest.java
Sun Oct 19 10:57:49 2008
@@ -32,6 +32,7 @@
 import org.apache.derbyTesting.junit.BaseJDBCTestCase;
 import org.apache.derbyTesting.junit.TestConfiguration;
 import org.apache.derbyTesting.junit.DatabasePropertyTestSetup;
+import org.apache.derbyTesting.junit.CleanDatabaseTestSetup;
 
 /**
  * Tests the lazy creation functionality of default schema: the schema
@@ -213,6 +214,82 @@
         c1.close();
     }
 
+    public void testDerby3043CheckConstraint() throws SQLException
+    {
+        // Demonstrate the DERBY-3043 workaround: if the table name is
+        // schema-qualified, check constraints do not cause a problem,
+        // and the named schema is automatically created if it does
+        // not yet exist:
+        Connection c0 = openUserConnection("frogs");
+        Statement s0 = c0.createStatement();
+
+        JDBC.assertEmpty( s0.executeQuery
+            ("select * from sys.sysschemas where schemaname='FROGS'"));
+        JDBC.assertEmpty( s0.executeQuery
+            ("select * from sys.sysschemas where schemaname='NOSUCH'"));
+
+        // A simple example, which should work whether or not the
+        // DERBY-3043 fix is in place
+
+        s0.executeUpdate("create table frogs.users2(username varchar(16) " +
+                        "CHECK(LENGTH(username)>7))");
+
+        // Demonstrate that any schema is lazy-created, not just the
+        // default schema which matches the username:
+
+        s0.executeUpdate("create table nosuch.users(username varchar(16) " +
+                        "CHECK(LENGTH(username)>7))");
+
+        // Schemas FROGS and NOSUCH have been lazy-created:
+
+        JDBC.assertSingleValueResultSet( s0.executeQuery(
+                "select schemaname from sys.sysschemas " +
+                "where schemaname='FROGS'"),
+            "FROGS");
+        JDBC.assertSingleValueResultSet( s0.executeQuery(
+                "select schemaname from sys.sysschemas " +
+                "where schemaname='NOSUCH'"),
+            "NOSUCH");
+        c0.close();
+
+        // Now verify that the test cases from DERBY-3043 pass:
+
+        Connection c1 = openUserConnection("blogs");
+
+        Statement s1 = c1.createStatement();
+    
+        // At the beginning, the schema 'blogs' does not exist.
+
+        JDBC.assertEmpty( s1.executeQuery
+            ("select * from sys.sysschemas where schemaname='BLOGS'"));
+
+        // Should work, but without the DERBY-3043 fix will get a
+        // "Schema blogs does not exist" error
+
+        s1.executeUpdate("create table users(username varchar(16) " +
+                        "CHECK(LENGTH(username)>7))");
+
+        // Another slightly more complicated example, which requires
+        // the DERBY-3043 fix again to work.
+
+        s1.executeUpdate("CREATE TABLE BLOGSCOM__BLOGS__USERS(" +
+                "PK INTEGER NOT NULL GENERATED ALWAYS AS IDENTITY," +
+                "username VARCHAR(16) NOT NULL " +
+                "  CONSTRAINT BLOGSCOM__BLOGS__USERS_UNIQUE_username UNIQUE " +
+                "  CONSTRAINT BLOGSCOM__BLOGS__USERS_PASSWORD_username " +
+                "    CHECK(LENGTH(username)>7)," +
+                "password VARCHAR (32672) NOT NULL , " +
+                "PRIMARY KEY(PK))"); 
+
+        // Schema BLOGS should have been lazy-created:
+
+        JDBC.assertSingleValueResultSet( s1.executeQuery(
+                "select schemaname from sys.sysschemas " +
+                "where schemaname='BLOGS'"),
+            "BLOGS");
+
+        c1.close();
+    }
 
 
 protected void  tearDown() throws Exception {
@@ -254,6 +331,10 @@
                   2,   // deadlock timeout
                   1)); // wait timeout
 
+            suites[i].addTest(new CleanDatabaseTestSetup(
+                new LazyDefaultSchemaCreationTest(
+                    "testDerby3043CheckConstraint")));
+
             if (i == 0) {
                 suite.addTest(suites[i]);
             } else {



Mime
View raw message