Return-Path: 
 <derby-commits-return-13288-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: (qmail 24468 invoked from network); 15 Oct 2010 08:03:08 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 15 Oct 2010 08:03:08 -0000
Received: (qmail 11657 invoked by uid 500); 15 Oct 2010 08:03:08 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 11593 invoked by uid 500); 15 Oct 2010 08:03:06 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 11583 invoked by uid 99); 15 Oct 2010 08:03:04 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Oct 2010 08:03:04 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Oct 2010 08:02:58 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id EEEF323889F7; Fri, 15 Oct 2010 08:02:00 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1022851 - in /db/derby/code/trunk/java:
 engine/org/apache/derby/catalog/types/
 testing/org/apache/derbyTesting/functionTests/master/
 testing/org/apache/derbyTesting/functionTests/master/DerbyNet/
 testing/org/apache/derbyTesting/functionTes...
Date: Fri, 15 Oct 2010 08:02:00 -0000
To: derby-commits@db.apache.org
From: kahatlen@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101015080200.EEEF323889F7@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kahatlen
Date: Fri Oct 15 08:02:00 2010
New Revision: 1022851

URL: http://svn.apache.org/viewvc?rev=1022851&view=rev
Log:
DERBY-1963: Routine parameter names displayed by dblook are not escaped

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net_territory.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net_territory.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB.sql

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/RoutineAliasInfo.java Fri Oct 15 08:02:00 2010
@@ -30,6 +30,7 @@ import java.io.ObjectInput;
 import java.io.ObjectOutput;
 import org.apache.derby.iapi.services.sanity.SanityManager;
 import org.apache.derby.iapi.types.DataTypeDescriptor;
+import org.apache.derby.iapi.util.IdUtil;
 
 /**
  * Describe a routine (procedure or function) alias.
@@ -387,7 +388,7 @@ public class RoutineAliasInfo extends Me
 				sb.append(RoutineAliasInfo.parameterMode(parameterModes[i]));
 				sb.append(' ');
 			}
-			sb.append(parameterNames[i]);
+			sb.append(IdUtil.normalToDelimited(parameterNames[i]));
 			sb.append(' ');
 			sb.append(parameterTypes[i].getSQLstring());
 		}

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net.out Fri Oct 15 08:02:00 2010
@@ -19,7 +19,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 <systemid>
@@ -59,7 +59,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -69,7 +69,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -79,7 +79,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 -----
 <systemid>
@@ -89,7 +89,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 -----
 <systemid>
@@ -99,7 +99,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 -----
 <systemid>
@@ -139,7 +139,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 -----
 <systemid>
@@ -173,13 +173,33 @@ false
 <systemname>
 -----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+-----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+-----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 ========== SYSCHECKS ==========
@@ -1767,6 +1787,10 @@ Foo Bar
 Foo Bar
 APP
 -----
+schema "'
+schema "'
+APP
+-----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net_territory.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net_territory.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net_territory.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dblook_test_net_territory.out Fri Oct 15 08:02:00 2010
@@ -19,7 +19,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 <systemid>
@@ -59,7 +59,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -69,7 +69,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -79,7 +79,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 -----
 <systemid>
@@ -89,7 +89,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 -----
 <systemid>
@@ -99,7 +99,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 -----
 <systemid>
@@ -139,7 +139,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 -----
 <systemid>
@@ -173,13 +173,33 @@ false
 <systemname>
 -----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+-----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+-----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 ========== SYSCHECKS ==========
@@ -1767,6 +1787,10 @@ Foo Bar
 Foo Bar
 APP
 -----
+schema "'
+schema "'
+APP
+-----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net.out Fri Oct 15 08:02:00 2010
@@ -19,7 +19,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 <systemid>
@@ -59,7 +59,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -69,7 +69,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -79,7 +79,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 -----
 <systemid>
@@ -89,7 +89,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 -----
 <systemid>
@@ -99,7 +99,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 -----
 <systemid>
@@ -139,7 +139,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 -----
 <systemid>
@@ -173,13 +173,33 @@ false
 <systemname>
 -----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+-----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+-----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 ========== SYSCHECKS ==========
@@ -1767,6 +1787,10 @@ Foo Bar
 Foo Bar
 APP
 -----
+schema "'
+schema "'
+APP
+-----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net_territory.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net_territory.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net_territory.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dblook_test_net_territory.out Fri Oct 15 08:02:00 2010
@@ -19,7 +19,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 <systemid>
@@ -59,7 +59,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -69,7 +69,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 -----
 <systemid>
@@ -79,7 +79,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 -----
 <systemid>
@@ -89,7 +89,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 -----
 <systemid>
@@ -99,7 +99,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 -----
 <systemid>
@@ -139,7 +139,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 -----
 <systemid>
@@ -173,13 +173,33 @@ false
 <systemname>
 -----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+-----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+-----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 -----
 ========== SYSCHECKS ==========
@@ -1767,6 +1787,10 @@ Foo Bar
 Foo Bar
 APP
 -----
+schema "'
+schema "'
+APP
+-----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/cast.out Fri Oct 15 08:02:00 2010
@@ -1675,13 +1675,13 @@ ij> -- Java casts to character types exc
 select cast (aliasinfo as CHAR(240)) from sys.sysaliases where CAST(alias AS VARCHAR(128)) = 'INSTALL_JAR';
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
-INSTALL_JAR(IN URL VARCHAR(256),IN JAR VARCHAR(128),IN DEPLOY INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA    &
+INSTALL_JAR(IN "URL" VARCHAR(256),IN "JAR" VARCHAR(128),IN "DEPLOY" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DA&
 ij> select cast (aliasinfo as VARCHAR(240)) from sys.sysaliases where CAST(alias AS VARCHAR(128)) = 'INSTALL_JAR';
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
-INSTALL_JAR(IN URL VARCHAR(256),IN JAR VARCHAR(128),IN DEPLOY INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA     
+INSTALL_JAR(IN "URL" VARCHAR(256),IN "JAR" VARCHAR(128),IN "DEPLOY" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DA&
 ij> select cast (aliasinfo as LONG VARCHAR) from sys.sysaliases where CAST(alias AS VARCHAR(128)) = 'INSTALL_JAR';
 1                                                                                                                               
 --------------------------------------------------------------------------------------------------------------------------------
-INSTALL_JAR(IN URL VARCHAR(256),IN JAR VARCHAR(128),IN DEPLOY INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA     
+INSTALL_JAR(IN "URL" VARCHAR(256),IN "JAR" VARCHAR(128),IN "DEPLOY" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DA&
 ij> 

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test.out Fri Oct 15 08:02:00 2010
@@ -12,7 +12,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 <systemid>
@@ -52,7 +52,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -62,7 +62,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -72,7 +72,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 ----
 <systemid>
@@ -82,7 +82,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 ----
 <systemid>
@@ -92,7 +92,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 ----
 <systemid>
@@ -132,7 +132,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 ----
 <systemid>
@@ -166,13 +166,33 @@ false
 <systemname>
 ----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 ========== SYSCHECKS ==========
@@ -1760,6 +1780,10 @@ Foo Bar
 Foo Bar
 APP
 ----
+schema "'
+schema "'
+APP
+----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>
@@ -2223,7 +2247,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 <systemid>
@@ -2263,7 +2287,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -2273,7 +2297,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -2283,7 +2307,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 ----
 <systemid>
@@ -2293,7 +2317,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 ----
 <systemid>
@@ -2303,7 +2327,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 ----
 <systemid>
@@ -2343,7 +2367,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 ----
 <systemid>
@@ -2377,13 +2401,33 @@ false
 <systemname>
 ----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 ========== SYSCHECKS ==========
@@ -3971,6 +4015,10 @@ Foo Bar
 Foo Bar
 APP
 ----
+schema "'
+schema "'
+APP
+----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>
@@ -4435,7 +4483,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 ----
 <systemid>
@@ -5916,11 +5964,11 @@ CREATE TYPE "APP"."PRICE" EXTERNAL NAME 
 -- ----------------------------------------------
 -- DDL Statements for stored procedures
 -- ----------------------------------------------
-CREATE PROCEDURE "APP"."PROC1" (INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3' 
+CREATE PROCEDURE "APP"."PROC1" (INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3' 
 -- ----------------------------------------------
 -- DDL Statements for functions
 -- ----------------------------------------------
-CREATE FUNCTION "APP"."GATP" (SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties' 
+CREATE FUNCTION "APP"."GATP" ("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties' 
 -- ----------------------------------------------
 -- DDL Statements for tables
 -- ----------------------------------------------
@@ -6073,11 +6121,11 @@ CREATE TYPE "APP"."PRICE" EXTERNAL NAME 
 -- ----------------------------------------------
 -- DDL Statements for stored procedures
 -- ----------------------------------------------
-CREATE PROCEDURE "APP"."PROC1" (INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3'  #
+CREATE PROCEDURE "APP"."PROC1" (INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3'  #
 -- ----------------------------------------------
 -- DDL Statements for functions
 -- ----------------------------------------------
-CREATE FUNCTION "APP"."GATP" (SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties'  #
+CREATE FUNCTION "APP"."GATP" ("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties'  #
 -- ----------------------------------------------
 -- DDL Statements for tables
 -- ----------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dblook_test_territory.out Fri Oct 15 08:02:00 2010
@@ -12,7 +12,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 <systemid>
@@ -52,7 +52,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -62,7 +62,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -72,7 +72,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 ----
 <systemid>
@@ -82,7 +82,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 ----
 <systemid>
@@ -92,7 +92,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 ----
 <systemid>
@@ -132,7 +132,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 ----
 <systemid>
@@ -166,13 +166,33 @@ false
 <systemname>
 ----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 ========== SYSCHECKS ==========
@@ -1760,6 +1780,10 @@ Foo Bar
 Foo Bar
 APP
 ----
+schema "'
+schema "'
+APP
+----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>
@@ -2223,7 +2247,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 <systemid>
@@ -2263,7 +2287,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA RETURNS NULL ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -2273,7 +2297,7 @@ org.apache.derbyTesting.functionTests.ut
 F
 F
 false
-getAllTableProperties(SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
+getAllTableProperties("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT
 <systemname>
 ----
 <systemid>
@@ -2283,7 +2307,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 ----
 <systemid>
@@ -2293,7 +2317,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4
 <systemname>
 ----
 <systemid>
@@ -2303,7 +2327,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA
 <systemname>
 ----
 <systemid>
@@ -2343,7 +2367,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-sqlControl(OUT E1 VARCHAR(128),OUT E2 VARCHAR(128),OUT E3 VARCHAR(128),OUT E4 VARCHAR(128),OUT E5 VARCHAR(128),OUT E6 VARCHAR(128),OUT E7 VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
+sqlControl(OUT "E1" VARCHAR(128),OUT "E2" VARCHAR(128),OUT "E3" VARCHAR(128),OUT "E4" VARCHAR(128),OUT "E5" VARCHAR(128),OUT "E6" VARCHAR(128),OUT "E7" VARCHAR(128)) LANGUAGE JAVA PARAMETER STYLE JAVA NO SQL
 <systemname>
 ----
 <systemid>
@@ -2377,13 +2401,33 @@ false
 <systemname>
 ----
 <systemid>
+func "'
+schema "'
+java.lang.Integer
+F
+F
+false
+toString("col with quotes ""'" INTEGER) RETURNS VARCHAR(20) LANGUAGE JAVA PARAMETER STYLE JAVA READS SQL DATA CALLED ON NULL INPUT
+<systemname>
+----
+<systemid>
+proc "'
+schema "'
+java.lang.Thread
+P
+P
+false
+sleep(IN "col with quotes ""'" BIGINT) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+<systemname>
+----
+<systemid>
 procTwo
 APP
 org.apache.derbyTesting.functionTests.util.ProcedureTest
 P
 P
 false
-inoutparams3(INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
+inoutparams3(INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA DYNAMIC RESULT SETS 2
 <systemname>
 ----
 ========== SYSCHECKS ==========
@@ -3971,6 +4015,10 @@ Foo Bar
 Foo Bar
 APP
 ----
+schema "'
+schema "'
+APP
+----
 ========== SYSSTATEMENTS ==========
 <systemid>
 <systemname>
@@ -4435,7 +4483,7 @@ org.apache.derbyTesting.functionTests.ut
 P
 P
 false
-inoutparams4(OUT A DECIMAL(4,2),IN B VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
+inoutparams4(OUT "A" DECIMAL(4,2),IN "B" VARCHAR(255)) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA
 <systemname>
 ----
 <systemid>
@@ -5916,11 +5964,11 @@ CREATE TYPE "APP"."PRICE" EXTERNAL NAME 
 -- ----------------------------------------------
 -- DDL Statements for stored procedures
 -- ----------------------------------------------
-CREATE PROCEDURE "APP"."PROC1" (INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3' 
+CREATE PROCEDURE "APP"."PROC1" (INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3' 
 -- ----------------------------------------------
 -- DDL Statements for functions
 -- ----------------------------------------------
-CREATE FUNCTION "APP"."GATP" (SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties' 
+CREATE FUNCTION "APP"."GATP" ("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties' 
 -- ----------------------------------------------
 -- DDL Statements for tables
 -- ----------------------------------------------
@@ -6073,11 +6121,11 @@ CREATE TYPE "APP"."PRICE" EXTERNAL NAME 
 -- ----------------------------------------------
 -- DDL Statements for stored procedures
 -- ----------------------------------------------
-CREATE PROCEDURE "APP"."PROC1" (INOUT A CHAR(10),IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3'  #
+CREATE PROCEDURE "APP"."PROC1" (INOUT "A" CHAR(10),IN "B" INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL DYNAMIC RESULT SETS 4 EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3'  #
 -- ----------------------------------------------
 -- DDL Statements for functions
 -- ----------------------------------------------
-CREATE FUNCTION "APP"."GATP" (SCH VARCHAR(128),TBL VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties'  #
+CREATE FUNCTION "APP"."GATP" ("SCH" VARCHAR(128),"TBL" VARCHAR(128)) RETURNS VARCHAR(1000) LANGUAGE JAVA PARAMETER STYLE JAVA CONTAINS SQL CALLED ON NULL INPUT EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties'  #
 -- ----------------------------------------------
 -- DDL Statements for tables
 -- ----------------------------------------------

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB.sql?rev=1022851&r1=1022850&r2=1022851&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_makeDB.sql Fri Oct 15 08:02:00 2010
@@ -71,6 +71,8 @@ create procedure "procTwo" (INOUT a CHAR
 
 create procedure """proc ""In Quotes with spaces""" (INOUT a CHAR(10), IN b int) language java external name 'org.apache.derbyTesting.functionTests.util.ProcedureTest.inoutparams3' parameter style java dynamic result sets 2 modifies sql data;
 
+create procedure "schema ""'"."proc ""'" (in "col with quotes ""'" bigint) language java parameter style java external name 'java.lang.Thread.sleep';
+
 create procedure p_deterministic() deterministic language java parameter style java modifies sql data external name 'foo.bar.wibble';
 
 create procedure p_not_deterministic() language java not deterministic parameter style java modifies sql data external name 'foo.bar.wibble';
@@ -85,6 +87,8 @@ create function gatp(SCH VARCHAR(128), T
 
 create function foo.gatp2(SCH VARCHAR(128), TBL VARCHAR(128)) RETURNS VARCHAR(1000) EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.TestPropertyInfo.getAllTableProperties' LANGUAGE JAVA PARAMETER STYLE JAVA RETURNS NULL ON NULL INPUT;
 
+create function "schema ""'"."func ""'" ("col with quotes ""'" int) returns varchar(20) language java parameter style java external name 'java.lang.Integer.toString';
+
 create function f_deterministic() returns int language java parameter style java deterministic no sql external name 'foo.bar.wibble';
 
 create function f_not_deterministic() returns int language java parameter style java no sql not deterministic external name 'foo.bar.wibble';