db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From banda...@apache.org
Subject svn commit: r371762 - in /db/derby/code/trunk/java: engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj testing/org/apache/derbyTesting/functionTests/master/autoincrement.out testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
Date Tue, 24 Jan 2006 01:08:45 GMT
Author: bandaram
Date: Mon Jan 23 17:08:40 2006
New Revision: 371762

URL: http://svn.apache.org/viewcvs?rev=371762&view=rev
Log:
DERBY-783: Follow up patch to previous checkin for this bug. Mark RESTART as a nonReservedWord.

Submitted by Mamta Satoor (msatoor@gmail.com)

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
    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/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=371762&r1=371761&r2=371762&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Mon Jan
23 17:08:40 2006
@@ -12513,7 +12513,8 @@
 	|	tok = <RENAME>
 	|	tok = <REPEATABLE>
 	|	tok = <REFERENCING>
-        |       tok = <RESET>
+	|	tok = <RESET>
+	|	tok = <RESTART>
 	|	tok = <RESULT>
 	|	tok = <RETAIN>
 	|	tok = <RETURNS>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/autoincrement.out?rev=371762&r1=371761&r2=371762&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 Jan 23 17:08:40 2006
@@ -1821,4 +1821,22 @@
 -----------------------
 1          |1          
 2          |3          
+ij(CONN2)> -- Since RESTART is not a reserved keyword, we should be able to create a table
with name RESTART
+create table restart (c11 int);
+0 rows inserted/updated/deleted
+ij(CONN2)> select * from restart;
+C11        
+-----------
+ij(CONN2)> create table newTable (restart int);
+0 rows inserted/updated/deleted
+ij(CONN2)> select * from newTable;
+RESTART    
+-----------
+ij(CONN2)> create table newTable2 (c11 int);
+0 rows inserted/updated/deleted
+ij(CONN2)> alter table newTable2 add column RESTART int;
+0 rows inserted/updated/deleted
+ij(CONN2)> select * from newTable2;
+C11        |RESTART    
+-----------------------
 ij(CONN2)> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/autoincrement.sql?rev=371762&r1=371761&r2=371762&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 Jan 23 17:08:40 2006
@@ -939,3 +939,12 @@
 from sys.syscolumns where COLUMNNAME = 'C11';
 insert into t1(c12) values(3);
 select * from t1;
+
+-- Since RESTART is not a reserved keyword, we should be able to create a table with name
RESTART
+create table restart (c11 int);
+select * from restart;
+create table newTable (restart int);
+select * from newTable;
+create table newTable2 (c11 int);
+alter table newTable2 add column RESTART int;
+select * from newTable2;



Mime
View raw message