Return-Path: Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 80883 invoked by uid 500); 9 Feb 2005 17:55:58 -0000 Delivered-To: apmail-incubator-derby-cvs@incubator.apache.org Received: (qmail 80878 invoked by uid 99); 9 Feb 2005 17:55:58 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 09 Feb 2005 09:55:57 -0800 Received: (qmail 28446 invoked by uid 65534); 9 Feb 2005 17:55:56 -0000 Message-ID: <20050209175556.28439.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 09 Feb 2005 17:55:56 -0000 Subject: svn commit: r153095 - in incubator/derby/code/trunk/java: engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj testing/org/apache/derbyTesting/functionTests/master/identifier.out testing/org/apache/derbyTesting/functionTests/tests/lang/identifier.sql To: derby-cvs@incubator.apache.org From: djd@apache.org X-Virus-Checked: Checked Author: djd Date: Wed Feb 9 09:55:54 2005 New Revision: 153095 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D153095 Log: Fix Derby-139 - remove LOCAL as a SQL reserved word. Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compil= e/sqlgrammar.jj incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/master/identifier.out incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/identifier.sql Modified: incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/= compile/sqlgrammar.jj URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/engine/o= rg/apache/derby/impl/sql/compile/sqlgrammar.jj?view=3Ddiff&r1=3D153094&r2= =3D153095 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compil= e/sqlgrammar.jj (original) +++ incubator/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compil= e/sqlgrammar.jj Wed Feb 9 09:55:54 2005 @@ -1682,7 +1682,6 @@ | | | -| | | | @@ -11096,6 +11095,9 @@ =20 NOTE: The same ones are commented out here as above in the token rule, for the same reason. + =09 + Derby-139 - LOCAL removed as reserved word as most other + databases do not enforce it. LOCAL not used at all in grammar so token r= emoved. */ ( /* SQL92 reserved Keywords */ @@ -11210,7 +11212,6 @@ | tok =3D | tok =3D | tok =3D -| tok =3D | tok =3D | tok =3D | tok =3D Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/master/identifier.out URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/master/identifier.out?view=3Ddiff&r1= =3D153094&r2=3D153095 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/master/identifier.out (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/master/identifier.out Wed Feb 9 09:55:54 2005 @@ -252,6 +252,29 @@ 2 |2 =20 ij> DROP TABLE ZONE; 0 rows inserted/updated/deleted +ij> CREATE TABLE LOCAL (LOCAL INT, A INT); +0 rows inserted/updated/deleted +ij> INSERT INTO LOCAL (LOCAL) VALUES (1); +1 row inserted/updated/deleted +ij> INSERT INTO LOCAL VALUES (2, 2); +1 row inserted/updated/deleted +ij> SELECT * FROM LOCAL; +LOCAL |A =20 +----------------------- +1 |NULL =20 +2 |2 =20 +ij> SELECT LOCAL.LOCAL, LOCAL FROM LOCAL; +LOCAL |LOCAL =20 +----------------------- +1 |1 =20 +2 |2 =20 +ij> SELECT LOCAL.LOCAL, LOCAL FROM LOCAL LOCAL; +LOCAL |LOCAL =20 +----------------------- +1 |1 =20 +2 |2 =20 +ij> DROP TABLE LOCAL; +0 rows inserted/updated/deleted ij> -- Negative tests -- Novera wanted 0-length delimited identifiers but for db2-compatibility,= we are going to stop supporting 0-length delimited identifiers -- test1 Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/f= unctionTests/tests/lang/identifier.sql URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/= org/apache/derbyTesting/functionTests/tests/lang/identifier.sql?view=3Ddiff= &r1=3D153094&r2=3D153095 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/identifier.sql (original) +++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functio= nTests/tests/lang/identifier.sql Wed Feb 9 09:55:54 2005 @@ -150,6 +150,13 @@ SELECT ZONE.ZONE, ZONE FROM ZONE ZONE; DROP TABLE ZONE; =20 +CREATE TABLE LOCAL (LOCAL INT, A INT); +INSERT INTO LOCAL (LOCAL) VALUES (1); +INSERT INTO LOCAL VALUES (2, 2); +SELECT * FROM LOCAL; +SELECT LOCAL.LOCAL, LOCAL FROM LOCAL; +SELECT LOCAL.LOCAL, LOCAL FROM LOCAL LOCAL; +DROP TABLE LOCAL; =20 -- Negative tests -- Novera wanted 0-length delimited identifiers but for db2-compatibility,= we are going to stop supporting 0-length delimited identifiers