db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r429425 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/sql/execute/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ testing/org/apache/derbyTesting/functionT...
Date Mon, 07 Aug 2006 18:33:13 GMT
Author: rhillegas
Date: Mon Aug  7 11:33:13 2006
New Revision: 429425

URL: http://svn.apache.org/viewvc?rev=429425&view=rev
Log:
DERBY-1554: Revert IDENTITY_VAL_LOCAL() behavior on multi-row inserts to that seen in 10.1.3.
Applying patch derby1554trunkdiff02.txt.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/autoGeneratedJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/autoGeneratedJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoGeneratedJdbc30.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java?rev=429425&r1=429424&r2=429425&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/execute/InsertResultSet.java
Mon Aug  7 11:33:13 2006
@@ -849,14 +849,28 @@
 		return isRow;
 	}
 
+    // checks if source result set is a RowResultSet type.
+    private boolean isSingleRowResultSet()
+    {
+        boolean isRow = false;
+        
+        if (sourceResultSet instanceof RowResultSet)
+        	isRow = true;
+        else if (sourceResultSet instanceof NormalizeResultSet)
+            isRow = (((NormalizeResultSet) sourceResultSet).source instanceof RowResultSet);
+        
+        return isRow;
+    }
+	
 	// Do the work for a "normal" insert
 	private void normalInsertCore(LanguageConnectionContext lcc, boolean firstExecute)
 		throws StandardException
 	{
+		boolean setUserIdentity = constants.hasAutoincrement() && isSingleRowResultSet();
 		boolean	firstDeferredRow = true;
 		ExecRow	deferredRowBuffer = null;
                 long user_autoinc=0;
-
+                        
 		/* Get or re-use the row changer.
 		 * NOTE: We need to set ourself as the top result set
 		 * if this is not the 1st execution.  (Done in constructor
@@ -997,7 +1011,7 @@
 
             rowCount++;
             
-            if(constants.hasAutoincrement())
+            if(setUserIdentity )
             {
                         dd = lcc.getDataDictionary();
                         td = dd.getTableDescriptor(constants.targetUUID);
@@ -1153,7 +1167,7 @@
                  * find the value of the identity column from the user inserted value
                  * and do a lcc.setIdentityValue(<user_value>);
                  */
-                else if(constants.hasAutoincrement())
+                else if(setUserIdentity )
                 {
                         lcc.setIdentityValue(user_autoinc);
                 } 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/autoGeneratedJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/autoGeneratedJdbc30.out?rev=429425&r1=429424&r2=429425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/autoGeneratedJdbc30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/autoGeneratedJdbc30.out
Mon Aug  7 11:33:13 2006
@@ -12,88 +12,88 @@
  there was no prior one-row insert into a table with autogenerated key
 	 1
 	 -
-	{3}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{6}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{9}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{12}
+	{null}
 Test 4 - request for generated keys after doing an insert into a table with no auto generated
keys
  And there has been no one-row insert into a table with auto-generated keys yet.
 We should get a resultset with one row of NULL value from getGeneratedKeys
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{12}
+	{null}
 Test 5a - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{6}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{18}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{null}
 Test 5b - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{0}
+	{null}
 Test 5c - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{25}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{26}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{27}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{28}
+	{null}
 Test 6 - request for generated keys after doing a one-row insert into a table with auto generated
keys
 We should get a resultset with one row of non-NULL value
 	 1
@@ -115,37 +115,37 @@
  This time we will get a row of non-NULL value because there has been a prior one-row insert
into table with auto-generated key 
 	 1
 	 -
-	{15}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{18}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{21}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 8 - create a new statement and request for generated keys on it after doing an insert
into 
  a table with no auto generated keys
 We should get a resultset with one row of non-NULL value
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 9 - request for generated keys on a statement which does a update 
 We should get a resultset with no rows from getGeneratedKeys because we executed a non-insert
sql
 <NULL>
@@ -169,37 +169,37 @@
 expected to see resultset with one row of NULL value but instead get one row of non-NULL
value from getGeneratedKeys
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 12 - do a rollback and request for generated keys on a statement which does insert into
a table with 
  no auto generated keys (previous transaction had a one-row insert on a table with auto-generated
keys)
 had expected to see resultset with one row of NULL value but instead get one row of non-NULL
value from getGeneratedKeys
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 13 - try savepoint rollback and see what happens to auto generated keys resultset
 Inside the savepoint unit, issue a one-row insert into a table with auto generated keys
 We should get a resultset with one row of non-NULL value

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/autoGeneratedJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/autoGeneratedJdbc30.out?rev=429425&r1=429424&r2=429425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/autoGeneratedJdbc30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/autoGeneratedJdbc30.out
Mon Aug  7 11:33:13 2006
@@ -12,88 +12,88 @@
  there was no prior one-row insert into a table with autogenerated key
 	 1
 	 -
-	{3}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{6}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{9}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{12}
+	{null}
 Test 4 - request for generated keys after doing an insert into a table with no auto generated
keys
  And there has been no one-row insert into a table with auto-generated keys yet.
 We should get a resultset with one row of NULL value from getGeneratedKeys
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{12}
+	{null}
 Test 5a - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{6}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{18}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{null}
 Test 5b - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{0}
+	{null}
 Test 5c - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{25}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{26}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{27}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{28}
+	{null}
 Test 6 - request for generated keys after doing a one-row insert into a table with auto generated
keys
 We should get a resultset with one row of non-NULL value
 	 1
@@ -115,37 +115,37 @@
  This time we will get a row of non-NULL value because there has been a prior one-row insert
into table with auto-generated key 
 	 1
 	 -
-	{15}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{18}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{21}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 8 - create a new statement and request for generated keys on it after doing an insert
into 
  a table with no auto generated keys
 We should get a resultset with one row of non-NULL value
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 9 - request for generated keys on a statement which does a update 
 We should get a resultset with no rows from getGeneratedKeys because we executed a non-insert
sql
 <NULL>
@@ -169,37 +169,37 @@
 expected to see resultset with one row of NULL value but instead get one row of non-NULL
value from getGeneratedKeys
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 12 - do a rollback and request for generated keys on a statement which does insert into
a table with 
  no auto generated keys (previous transaction had a one-row insert on a table with auto-generated
keys)
 had expected to see resultset with one row of NULL value but instead get one row of non-NULL
value from getGeneratedKeys
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 13 - try savepoint rollback and see what happens to auto generated keys resultset
 Inside the savepoint unit, issue a one-row insert into a table with auto generated keys
 We should get a resultset with one row of non-NULL value

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoGeneratedJdbc30.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoGeneratedJdbc30.out?rev=429425&r1=429424&r2=429425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoGeneratedJdbc30.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoGeneratedJdbc30.out
Mon Aug  7 11:33:13 2006
@@ -12,88 +12,88 @@
  there was no prior one-row insert into a table with autogenerated key
 	 1
 	 -
-	{3}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{6}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{9}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{12}
+	{null}
 Test 4 - request for generated keys after doing an insert into a table with no auto generated
keys
  And there has been no one-row insert into a table with auto-generated keys yet.
 We should get a resultset with one row of NULL value from getGeneratedKeys
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{12}
+	{null}
 Test 5a - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{6}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{12}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{18}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{null}
 Test 5b - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{0}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{0}
+	{null}
 Test 5c - request for generated keys after doing a one-row insert(using a subquery) into
a table with autogenerated key using a subquery with auto generated keys
 Even though this is a one-row insert but since insert has a sub-select, get generated keys
will return one row of NULL value
 	 1
 	 -
-	{25}
+	{null}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{26}
+	{null}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{27}
+	{null}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{28}
+	{null}
 Test 6 - request for generated keys after doing a one-row insert into a table with auto generated
keys
 We should get a resultset with one row of non-NULL value
 	 1
@@ -115,37 +115,37 @@
  This time we will get a row of non-NULL value because there has been a prior one-row insert
into table with auto-generated key 
 	 1
 	 -
-	{15}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{18}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{21}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 8 - create a new statement and request for generated keys on it after doing an insert
into 
  a table with no auto generated keys
 We should get a resultset with one row of non-NULL value
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 9 - request for generated keys on a statement which does a update 
 We should get a resultset with no rows from getGeneratedKeys because we executed a non-insert
sql
 <NULL>
@@ -169,37 +169,37 @@
 expected to see resultset with one row of NULL value but instead get one row of non-NULL
value from getGeneratedKeys
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 12 - do a rollback and request for generated keys on a statement which does insert into
a table with 
  no auto generated keys (previous transaction had a one-row insert on a table with auto-generated
keys)
 had expected to see resultset with one row of NULL value but instead get one row of non-NULL
value from getGeneratedKeys
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with Statement.executeUpdate. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.execute. It should behave
the same
 	 1
 	 -
-	{24}
+	{32}
 Now try the same test again but this time with PreparedStatement.executeUpdate. It should
behave the same
 	 1
 	 -
-	{24}
+	{32}
 Test 13 - try savepoint rollback and see what happens to auto generated keys resultset
 Inside the savepoint unit, issue a one-row insert into a table with auto generated keys
 We should get a resultset with one row of non-NULL value

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out?rev=429425&r1=429424&r2=429425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
Mon Aug  7 11:33:13 2006
@@ -282,21 +282,21 @@
 0 rows inserted/updated/deleted
 ij> insert into ai_test (y) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 10 rows inserted/updated/deleted
-ij> -- should see 20.
+ij> -- should see 0.
 values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-20                             
+0                              
 ij> insert into ai_test (y) select y+10 from ai_test;
 10 rows inserted/updated/deleted
 ij> values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-40                             
+0                              
 ij> values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-40                             
+0                              
 ij> -- try some more connection info tests
 create table ai_single1 (c char(100), a_odd int generated always as identity (start with
1, increment by 2));
 0 rows inserted/updated/deleted
@@ -588,7 +588,7 @@
 ij> values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-4                              
+0                              
 ij> -- test some more generated column specs
 create table trigtest (s1 smallint generated always as identity, lvl int);
 0 rows inserted/updated/deleted
@@ -1169,7 +1169,7 @@
 values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-4                              
+2                              
 ij> select * from t1;
 C1         |C2         
 -----------------------
@@ -1183,7 +1183,7 @@
 values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-8                              
+2                              
 ij> select * from t1;
 C1         |C2         
 -----------------------
@@ -1200,13 +1200,13 @@
 ij> values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-8                              
+2                              
 ij> insert into t1(c2) select c1 from t1;
 0 rows inserted/updated/deleted
 ij> values IDENTITY_VAL_LOCAL();
 1                              
 -------------------------------
-0                              
+2                              
 ij> -- end of practice, back to start...
 insert into t1(c2) values (8);
 1 row inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql?rev=429425&r1=429424&r2=429425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
Mon Aug  7 11:33:13 2006
@@ -164,7 +164,7 @@
 					  y int);
 insert into ai_test (y) values (1),(2),(3),(4),(5),(6),(7),(8),(9),(10);
 
--- should see 20.
+-- should see 0.
 values IDENTITY_VAL_LOCAL();
 
 insert into ai_test (y) select y+10 from ai_test;



Mime
View raw message