Fix in calling SET @X = IDENTITY() where it would return NULL incorrectly

h2/src/docsrc/html/changelog.html

@@ -22,6 +22,7 @@ Change Log
     Thanks to Prashant Bhat for the patch!
 </li><li>Fix for a bug where we would sometimes use the wrong unique constraint to validate foreign key constraints.
 </li><li>Support BOM at the beginning of files for the RUNSCRIPT command
+</li><li>Fix in calling SET @X = IDENTITY() where it would return NULL incorrectly
 </li></ul>
 
 <h2>Version 1.3.169 (2012-09-09)</h2>

h2/src/main/org/h2/command/CommandContainer.java

@@ -70,7 +70,7 @@ class CommandContainer extends Command {
         recompileIfRequired();
         setProgress(DatabaseEventListener.STATE_STATEMENT_START);
         start();
-        session.setLastIdentity(ValueNull.INSTANCE);
+        session.setLastScopeIdentity(ValueNull.INSTANCE);
         prepared.checkParameters();
         int updateCount = prepared.update();
         prepared.trace(startTime, updateCount);

h2/src/main/org/h2/engine/Session.java

@@ -707,8 +707,8 @@ public class Session extends SessionWithState {
     }
 
     public void setLastIdentity(Value last) {
-        this.lastScopeIdentity = last;
         this.lastIdentity = last;
+        this.lastScopeIdentity = last;
     }
 
     public Value getLastIdentity() {

h2/src/test/org/h2/test/jdbc/TestStatement.java

@@ -335,7 +335,16 @@ public class TestStatement extends TestBase {
         rs.next();
         assertEquals(7, rs.getInt(1));
         assertFalse(rs.next());
+        
+        stat.execute("CREATE TABLE TEST2(ID identity primary key)");
+        stat.execute("INSERT INTO TEST2 VALUES()");
+        stat.execute("SET @X = IDENTITY()");
+        rs = stat.executeQuery("SELECT @X");
+        rs.next();
+        assertEquals(1, rs.getInt(1));
+
         stat.execute("DROP TABLE TEST");
+        stat.execute("DROP TABLE TEST2");
     }
 
 }