db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r157804 - in incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNetClient/testij.out tests/derbynet/dataSourcePermissions_net.java tests/derbynet/testclientij.sql tests/tools/dblook_test.java
Date Wed, 16 Mar 2005 21:15:48 GMT
Author: kmarsden
Date: Wed Mar 16 13:15:46 2005
New Revision: 157804

URL: http://svn.apache.org/viewcvs?view=rev&rev=157804
Log:
More test and master updates for client for URL format


Modified:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testclientij.sql
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out?view=diff&r1=157803&r2=157804
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testij.out
Wed Mar 16 13:15:46 2005
@@ -2,7 +2,7 @@
 org.apache.derby.tools.ij extin/testclientij.sql 
 ij> driver 'org.apache.derby.jdbc.ClientDriver';
 ij> --Bug 4632  Make the db italian to make sure string selects  are working
-connect 'jdbc:derby://localhost:1527/wombat;create=true;territory=it:' USER 'dbadmin' PASSWORD
'dbadmin';
+connect 'jdbc:derby://localhost:1527/wombat;create=true;territory=it' USER 'dbadmin' PASSWORD
'dbadmin';
 ij> connect 'jdbc:derby://localhost:1527/wombat' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij(CONNECTION1)> -- this is a comment, a comment in front of a select should not cause
an error
 select * from sys.systables where 1=0;
@@ -17,31 +17,40 @@
 1 row selected
 ij(CONNECTION1)> -- Try some URL attributes
 disconnect all;
-ij> connect 'jdbc:derby://localhost:1527/junk;create=true:' USER 'dbadmin' PASSWORD 'dbadbmin';
+ij> connect 'jdbc:derby://localhost:1527/junk;create=true' USER 'dbadmin' PASSWORD 'dbadbmin';
 ij> select * from APP.notthere;
 ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
 ij> -- examples from the docs
-connect 'jdbc:derby://localhost:1527/wombat;create=true:user=judy;password=judy;';
-ij(CONNECTION1)> connect 'jdbc:derby://localhost:1527/"./wombat":user=judy;password=judy;';
-ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB:';
+connect 'jdbc:derby://localhost:1527/wombat;create=true;user=judy;password=judy';
+ij(CONNECTION1)> connect 'jdbc:derby://localhost:1527/./wombat;user=judy;password=judy';
+ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB';
 ERROR (no SQLState): null userid not supported
-ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB:' USER 'dbadmin' PASSWORD
'dbadbmin';
+ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD
'dbadbmin';
 ERROR 08004: The application server rejected establishment of the connection.  An attempt
was made to access a database, toursDB, which was not found.
 ij(CONNECTION2)> connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
-ij(CONNECTION3)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true:user=usr;password=pwd;';
-ij(CONNECTION4)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true:user=usr;password=pwd;';
-ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true:user=usr;password=pwd;'
------ Quoted db and attributes
-connect 'jdbc:derby://localhost:1527/"./my-dbname;create=true":user=usr;password=pwd;';
+ij(CONNECTION3)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
+ij(CONNECTION4)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
+ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
 ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: my-db-name08006.DDatabase
'my-db-name' shutdown.((server log XXX)
-ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/"./my-dbname;create=true":user=usr;password=pwd;';
-ij(CONNECTION6)> -- retrieveMessageText Testing
-connect 'jdbc:derby://localhost:1527/my-db-name;create=true:user=usr;password=pwd;retrieveMessageText=false;';
-ij(CONNECTION7)> -- Should not get message text
+ij(CONNECTION5)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION6)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION7)> connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD
'dbadbmin';
+ERROR 08004: The application server rejected establishment of the connection.  An attempt
was made to access a database, toursDB, which was not found.
+ij(CONNECTION7)> connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
+ij(CONNECTION8)> connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
+ij(CONNECTION9)> connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
+ij(CONNECTION10)> connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
+ERROR 08006: DERBY SQL error: SQLCODE: -1, SQLSTATE: 08006, SQLERRMC: my-db-name08006.DDatabase
'my-db-name' shutdown.((server log XXX)
+ij(CONNECTION10)> -- Database names with /'s
+connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION11)> connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
+ij(CONNECTION12)> -- retrieveMessageText Testing
+connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=false';
+ij(CONNECTION13)> -- Should not get message text
 select * from APP.notthere;
 ERROR 42X05: DERBY SQL error: SQLCODE: -1, SQLSTATE: 42X05, SQLERRMC: APP.NOTTHERE42X05
-ij(CONNECTION7)> connect 'jdbc:derby://localhost:1527/my-db-name;create=true:user=usr;password=pwd;retrieveMessageText=true;';
-ij(CONNECTION8)> -- Should see message text
+ij(CONNECTION13)> connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=true';
+ij(CONNECTION14)> -- Should see message text
 select * from APP.notthere;
 ERROR 42X05: Table 'APP.NOTTHERE' does not exist.
-ij(CONNECTION8)> 
+ij(CONNECTION14)> 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java?view=diff&r1=157803&r2=157804
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
Wed Mar 16 13:15:46 2005
@@ -137,7 +137,10 @@
 		String s = TestUtil.getJdbcUrlPrefix("localhost", NETWORKSERVER_PORT) 
 			+ db;
 		if (attrs != null)
-			s = s + ":" + attrs + ";";
+			if (TestUtil.isJCCFramework())
+				s = s + ":" + attrs + ";";
+			else
+				s = s + ";" + attrs;
 		//System.out.println("getJDBCUrl:" + s);
 		return s;
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testclientij.sql
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testclientij.sql?view=diff&r1=157803&r2=157804
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testclientij.sql
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testclientij.sql
Wed Mar 16 13:15:46 2005
@@ -1,6 +1,6 @@
 driver 'org.apache.derby.jdbc.ClientDriver';
 --Bug 4632  Make the db italian to make sure string selects  are working
-connect 'jdbc:derby://localhost:1527/wombat;create=true;territory=it:' USER 'dbadmin' PASSWORD
'dbadmin';
+connect 'jdbc:derby://localhost:1527/wombat;create=true;territory=it' USER 'dbadmin' PASSWORD
'dbadmin';
 
 connect 'jdbc:derby://localhost:1527/wombat' USER 'dbadmin' PASSWORD 'dbadbmin';
 -- this is a comment, a comment in front of a select should not cause an error
@@ -10,45 +10,59 @@
 
 -- Try some URL attributes
 disconnect all;
-connect 'jdbc:derby://localhost:1527/junk;create=true:' USER 'dbadmin' PASSWORD 'dbadbmin';
+connect 'jdbc:derby://localhost:1527/junk;create=true' USER 'dbadmin' PASSWORD 'dbadbmin';
 select * from APP.notthere;
 
 
 -- examples from the docs
 
-connect 'jdbc:derby://localhost:1527/wombat;create=true:user=judy;password=judy;';
+connect 'jdbc:derby://localhost:1527/wombat;create=true;user=judy;password=judy';
 
-connect 'jdbc:derby://localhost:1527/"./wombat":user=judy;password=judy;';
+connect 'jdbc:derby://localhost:1527/./wombat;user=judy;password=judy';
 
-connect 'jdbc:derby://localhost:1527/toursDB:';
+connect 'jdbc:derby://localhost:1527/toursDB';
 
 
-connect 'jdbc:derby://localhost:1527/toursDB:' USER 'dbadmin' PASSWORD 'dbadbmin';
+connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD 'dbadbmin';
 
 connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
 
-connect  'jdbc:derby://localhost:1527/my-db-name;create=true:user=usr;password=pwd;';
+connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
 
-connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true:user=usr;password=pwd;';
+connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
 
+connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
 
-connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true:user=usr;password=pwd;'
+connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
 
--- Quoted db and attributes
-connect 'jdbc:derby://localhost:1527/"./my-dbname;create=true":user=usr;password=pwd;';
+connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
 
-connect 'jdbc:derby://localhost:1527/"./my-dbname;create=true":user=usr;password=pwd;';
+connect 'jdbc:derby://localhost:1527/toursDB' USER 'dbadmin' PASSWORD 'dbadbmin';
+
+connect 'jdbc:derby://localhost:1527/wombat' USER 'APP' PASSWORD 'APP';
+
+connect  'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd';
+
+connect 'jdbc:derby://localhost:1527/my-db-name;upgrade=true;user=usr;password=pwd';
+
+connect 'jdbc:derby://localhost:1527/my-db-name;shutdown=true;user=usr;password=pwd';
+
+-- Database names with /'s
+connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
+
+connect 'jdbc:derby://localhost:1527/./my-dbname;create=true;user=usr;password=pwd';
 
 
 
 -- retrieveMessageText Testing
-connect 'jdbc:derby://localhost:1527/my-db-name;create=true:user=usr;password=pwd;retrieveMessageText=false;';
+connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=false';
 
 -- Should not get message text
 select * from APP.notthere;
 
-connect 'jdbc:derby://localhost:1527/my-db-name;create=true:user=usr;password=pwd;retrieveMessageText=true;';
+connect 'jdbc:derby://localhost:1527/my-db-name;create=true;user=usr;password=pwd;retrieveMessageText=true';
 
 -- Should see message text
 select * from APP.notthere;
+
 

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java?view=diff&r1=157803&r2=157804
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
(original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/dblook_test.java
Wed Mar 16 13:15:46 2005
@@ -387,8 +387,14 @@
 		printAsHeader("\nDumping DDL for all objects, " +
 			"using\nNetwork Server:\n");
 		jdbcProtocol = TestUtil.getJdbcUrlPrefix("localhost",SERVER_PORT);
-		String sourceDBUrl = jdbcProtocol + "\"" + dbPath +
-			separator + dbName + "\":user=someusr;password=somepwd;";
+
+		String sourceDBUrl;
+		if (TestUtil.isJCCFramework())
+			sourceDBUrl = jdbcProtocol + "\"" + dbPath +
+				separator + dbName + "\":user=someusr;password=somepwd;";
+		else
+			sourceDBUrl = jdbcProtocol + dbPath +
+			separator + dbName + ";user=someusr;password=somepwd";
 
 		// Make sure we're not connected to the database
 		// (we connected to it in embedded mode when we



Mime
View raw message