You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by rh...@apache.org on 2011/06/01 15:07:06 UTC
svn commit: r1130139 - in /db/derby/code/branches/10.6/java:
engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
Author: rhillegas
Date: Wed Jun 1 13:07:06 2011
New Revision: 1130139
URL: http://svn.apache.org/viewvc?rev=1130139&view=rev
Log:
DERBY-5254: Ported 1130127 from trunk to 10.6 branch.
Modified:
db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
Modified: db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=1130139&r1=1130138&r2=1130139&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/branches/10.6/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Wed Jun 1 13:07:06 2011
@@ -14480,6 +14480,7 @@ nonReservedKeyword() :
| tok = <CS>
| tok = <CURDATE>
| tok = <CURTIME>
+ | tok = <CYCLE>
| tok = <D>
| tok = <DATA>
| tok = <DATE>
@@ -14516,6 +14517,8 @@ nonReservedKeyword() :
| tok = <LOCKSIZE>
| tok = <LOGGED>
| tok = <LONG>
+ | tok = <MAXVALUE>
+ | tok = <MINVALUE>
| tok = <MESSAGE_LOCALE>
| tok = <METHOD>
| tok = <MOD>
Modified: db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java?rev=1130139&r1=1130138&r2=1130139&view=diff
==============================================================================
--- db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java (original)
+++ db/derby/code/branches/10.6/java/testing/org/apache/derbyTesting/functionTests/tests/lang/SequenceTest.java Wed Jun 1 13:07:06 2011
@@ -519,4 +519,14 @@ public class SequenceTest extends Genera
}
+ /**
+ * Verify that the new sequence-related keywords are non-reserved keywords.
+ */
+ public void test_15_5254() throws Exception
+ {
+ Connection conn = openUserConnection(ALPHA);
+
+ goodStatement( conn, "create table t_5254( cycle int, minvalue int, maxvalue int )" );
+ goodStatement( conn, "drop table t_5254" );
+ }
}