Return-Path: Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: (qmail 41539 invoked from network); 4 Jan 2007 03:02:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jan 2007 03:02:00 -0000 Received: (qmail 60062 invoked by uid 500); 4 Jan 2007 03:02:07 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 60033 invoked by uid 500); 4 Jan 2007 03:02:06 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 60022 invoked by uid 99); 4 Jan 2007 03:02:06 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jan 2007 19:02:06 -0800 X-ASF-Spam-Status: No, hits=-9.2 required=10.0 tests=ALL_TRUSTED,MAILTO_TO_SPAM_ADDR,NO_REAL_NAME,UPPERCASE_25_50 X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Jan 2007 19:01:59 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 41AD31A981A; Wed, 3 Jan 2007 19:01:02 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492392 - in /db/derby/code/branches/10.2/java: engine/org/apache/derby/impl/sql/compile/ testing/org/apache/derbyTesting/functionTests/master/ testing/org/apache/derbyTesting/functionTests/master/j9_foundation/ testing/org/apache/derbyTest... Date: Thu, 04 Jan 2007 03:01:01 -0000 To: derby-commits@db.apache.org From: bpendleton@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070104030102.41AD31A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bpendleton Date: Wed Jan 3 19:00:59 2007 New Revision: 492392 URL: http://svn.apache.org/viewvc?view=rev&rev=492392 Log: DERBY-2202: DROP PROCEDURE depends on SET SCHEMA This patch was contributed by Yip Ng (yipng168@gmail.com) This change includes derby2202-10.2-diff01.txt as prepared by Yip Ng, and also includes svn merge -r 492252:492253 to pick up Myrna's j9 fix. Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/depend.out db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/depend.sql Modified: db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java?view=diff&rev=492392&r1=492391&r2=492392 ============================================================================== --- db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java (original) +++ db/derby/code/branches/10.2/java/engine/org/apache/derby/impl/sql/compile/DropAliasNode.java Wed Jan 3 19:00:59 2007 @@ -125,6 +125,9 @@ throw StandardException.newException(SQLState.LANG_CANNOT_DROP_SYSTEM_ALIASES, aliasName); } + // Statement is dependent on the AliasDescriptor + getCompilerContext().createDependency(ad); + return this; } Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/depend.out URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/depend.out?view=diff&rev=492392&r1=492391&r2=492392 ============================================================================== --- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/depend.out (original) +++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/depend.out Wed Jan 3 19:00:59 2007 @@ -239,4 +239,109 @@ 4 |4 ij> -- cleanup, roll everything back to the beginning rollback; +ij> -- DERBY-2202 +-- test various DROP statements +-- test procedure +autocommit off; +ij> CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +0 rows inserted/updated/deleted +ij> DROP PROCEDURE datamgmt.exit; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +0 rows inserted/updated/deleted +ij> DROP PROCEDURE datamgmt.exit; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> autocommit on; +ij> CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +0 rows inserted/updated/deleted +ij> DROP PROCEDURE datamgmt.exit; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +0 rows inserted/updated/deleted +ij> DROP PROCEDURE datamgmt.exit; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> -- test function +CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE FUNCTION datamgmt.f_abs(P1 INT) + RETURNS INT + NO SQL + RETURNS NULL ON NULL INPUT + EXTERNAL NAME 'java.lang.Math.abs' + LANGUAGE JAVA PARAMETER STYLE JAVA; +0 rows inserted/updated/deleted +ij> DROP FUNCTION datamgmt.f_abs; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE FUNCTION datamgmt.f_abs(P1 INT) + RETURNS INT + NO SQL + RETURNS NULL ON NULL INPUT + EXTERNAL NAME 'java.lang.Math.abs' + LANGUAGE JAVA PARAMETER STYLE JAVA; +0 rows inserted/updated/deleted +ij> DROP FUNCTION datamgmt.f_abs; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> -- test synonym +CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE TABLE datamgmt.t1 (c1 int); +0 rows inserted/updated/deleted +ij> CREATE SYNONYM datamgmt.s1 for datamgmt.t1; +0 rows inserted/updated/deleted +ij> DROP SYNONYM datamgmt.s1; +0 rows inserted/updated/deleted +ij> DROP TABLE datamgmt.t1; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted +ij> CREATE SCHEMA datamgmt; +0 rows inserted/updated/deleted +ij> CREATE TABLE datamgmt.t1 (c1 int); +0 rows inserted/updated/deleted +ij> CREATE SYNONYM datamgmt.s1 for datamgmt.t1; +0 rows inserted/updated/deleted +ij> DROP SYNONYM datamgmt.s1; +0 rows inserted/updated/deleted +ij> DROP TABLE datamgmt.t1; +0 rows inserted/updated/deleted +ij> DROP SCHEMA datamgmt RESTRICT; +0 rows inserted/updated/deleted ij> Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out?view=diff&rev=492392&r1=492391&r2=492392 ============================================================================== --- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out (original) +++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/grantRevokeDDL.out Wed Jan 3 19:00:59 2007 @@ -2200,7 +2200,7 @@ ij(MAMTA1)> grant select on t12RoutineTest to mamta3; 0 rows inserted/updated/deleted ij(MAMTA1)> drop function selectFromSpecificSchema; -ERROR: Failed with SQLSTATE 42X94 +ERROR: Failed with SQLSTATE 42Y55 ij(MAMTA1)> CREATE FUNCTION selectFromSpecificSchema (P1 INT) RETURNS INT RETURNS NULL ON NULL INPUT Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out?view=diff&rev=492392&r1=492391&r2=492392 ============================================================================== --- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out (original) +++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/grantRevokeDDL.out Wed Jan 3 19:00:59 2007 @@ -2194,7 +2194,7 @@ ij(MAMTA1)> grant select on t12RoutineTest to mamta3; 0 rows inserted/updated/deleted ij(MAMTA1)> drop function selectFromSpecificSchema; -ERROR: Failed with SQLSTATE 42X94 +ERROR: Failed with SQLSTATE 42Y55 ij(MAMTA1)> CREATE FUNCTION selectFromSpecificSchema (P1 INT) RETURNS INT RETURNS NULL ON NULL INPUT Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/depend.sql URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/depend.sql?view=diff&rev=492392&r1=492391&r2=492392 ============================================================================== --- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/depend.sql (original) +++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/depend.sql Wed Jan 3 19:00:59 2007 @@ -158,3 +158,80 @@ -- cleanup, roll everything back to the beginning rollback; + +-- DERBY-2202 +-- test various DROP statements + +-- test procedure +autocommit off; +CREATE SCHEMA datamgmt; +CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +DROP PROCEDURE datamgmt.exit; +DROP SCHEMA datamgmt RESTRICT; +CREATE SCHEMA datamgmt; +CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +DROP PROCEDURE datamgmt.exit; +DROP SCHEMA datamgmt RESTRICT; + +autocommit on; +CREATE SCHEMA datamgmt; +CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +DROP PROCEDURE datamgmt.exit; +DROP SCHEMA datamgmt RESTRICT; + +CREATE SCHEMA datamgmt; +CREATE PROCEDURE datamgmt.exit ( IN value INTEGER ) + MODIFIES SQL DATA + PARAMETER STYLE JAVA + LANGUAGE JAVA + EXTERNAL NAME 'java.lang.System.exit'; +DROP PROCEDURE datamgmt.exit; +DROP SCHEMA datamgmt RESTRICT; + +-- test function +CREATE SCHEMA datamgmt; +CREATE FUNCTION datamgmt.f_abs(P1 INT) + RETURNS INT + NO SQL + RETURNS NULL ON NULL INPUT + EXTERNAL NAME 'java.lang.Math.abs' + LANGUAGE JAVA PARAMETER STYLE JAVA; +DROP FUNCTION datamgmt.f_abs; +DROP SCHEMA datamgmt RESTRICT; + +CREATE SCHEMA datamgmt; +CREATE FUNCTION datamgmt.f_abs(P1 INT) + RETURNS INT + NO SQL + RETURNS NULL ON NULL INPUT + EXTERNAL NAME 'java.lang.Math.abs' + LANGUAGE JAVA PARAMETER STYLE JAVA; +DROP FUNCTION datamgmt.f_abs; +DROP SCHEMA datamgmt RESTRICT; + +-- test synonym +CREATE SCHEMA datamgmt; +CREATE TABLE datamgmt.t1 (c1 int); +CREATE SYNONYM datamgmt.s1 for datamgmt.t1; +DROP SYNONYM datamgmt.s1; +DROP TABLE datamgmt.t1; +DROP SCHEMA datamgmt RESTRICT; + +CREATE SCHEMA datamgmt; +CREATE TABLE datamgmt.t1 (c1 int); +CREATE SYNONYM datamgmt.s1 for datamgmt.t1; +DROP SYNONYM datamgmt.s1; +DROP TABLE datamgmt.t1; +DROP SCHEMA datamgmt RESTRICT;