db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From banda...@apache.org
Subject svn commit: r151100 - in incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient: dbMetaDataJdbc30.out ieptests.out importExport.out metadataJdbc20.out procedure.out secureUsers.out users.out users2.out
Date Thu, 03 Feb 2005 01:58:29 GMT
Author: bandaram
Date: Wed Feb  2 17:58:27 2005
New Revision: 151100

URL: http://svn.apache.org/viewcvs?view=rev&rev=151100
Log:
In preparation for Derby Net Client submission for a community vote, update a few masters.

Submitted by Satheesh Bandaram. (satheesh@sourcery.org)

Added:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out   (with props)
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out   (with props)
Modified:
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
    incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out?view=diff&r1=151099&r2=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dbMetaDataJdbc30.out Wed Feb  2 17:58:27 2005
@@ -1,6 +1,6 @@
 Test dbMetaDataJdbc30 starting
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
-The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
+The URL is: jdbc:derby://localhost:1527/wombat;create=true
 supportsSavepoints() : true
 supportsNamedParameters() : false
 supportsMultipleOpenResults() : true

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out?view=auto&rev=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out Wed Feb  2 17:58:27 2005
@@ -0,0 +1,721 @@
+ij> --table used for export
+create table ex_emp(id int , name char(7) , skills varchar(200), salary decimal(10,2)) ;
+0 rows inserted/updated/deleted
+ij> --table used for import
+create table imp_emp(id int , name char(7), skills varchar(200), salary decimal(10,2)) ;
+0 rows inserted/updated/deleted
+ij> --After an export from ex_emp and import to imp_emp both tables should have 
+-----same data.
+-----double delimter cases with default character delimter "
+-----field seperator character inside a double delimited string as first line
+insert into ex_emp values(99, 'smith' , 'tennis"p,l,ayer"', 190.55) ;
+1 row inserted/updated/deleted
+ij> -- Perform Export:
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+                                 null, null, null) ;
+Statement executed.
+ij> -- Perform Import
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+                                      null, null, null, 0) ;
+Statement executed.
+ij> insert into ex_emp values(100, 'smith' , 'tennis"player"', 190.55) ;
+1 row inserted/updated/deleted
+ij> insert into ex_emp values(101, 'smith' , 'tennis"player', 190.55) ;
+1 row inserted/updated/deleted
+ij> insert into ex_emp values(102, 'smith' , '"tennis"player', 190.55) ;
+1 row inserted/updated/deleted
+ij> insert into ex_emp values(103, 'smith' , '"tennis"player"', 190.55) ;
+1 row inserted/updated/deleted
+ij> insert into ex_emp values(104, 'smith' , '"tennis"""""""""""""""""""""""""""""""""""""player"', null) ;
+1 row inserted/updated/deleted
+ij> --empty string
+insert into ex_emp values(105, 'smith' , '""', 190.55) ;
+1 row inserted/updated/deleted
+ij> --just delimeter inside 
+insert into ex_emp values(106, 'smith' , '"""""""""""""""""""', 190.55);
+1 row inserted/updated/deleted
+ij> --null value
+insert into ex_emp values(107, 'smith"' , null, 190.55) ;
+1 row inserted/updated/deleted
+ij> --all values are nulls
+insert into ex_emp values(108, null , null, null) ;
+1 row inserted/updated/deleted
+ij> -- Perform Export:
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+                                 null, null, null) ;
+Statement executed.
+ij> -- Perform Import
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+                                      null, null, null, 0) ;
+Statement executed.
+ij> select * from ex_emp;
+ID |NAME |SKILLS |SALARY      
+-----
+99 |smith |tennis"p,l,ayer" |190.55      
+100 |smith |tennis"player" |190.55      
+101 |smith |tennis"player |190.55      
+102 |smith |"tennis"player |190.55      
+103 |smith |"tennis"player" |190.55      
+104 |smith |"tennis"""""""""""""""""""""""""""""""""""""player" |NULL        
+105 |smith |"" |190.55      
+106 |smith |""""""""""""""""""" |190.55      
+107 |smith" |NULL |190.55      
+108 |NULL |NULL |NULL        
+ij> select * from imp_emp;
+ID |NAME |SKILLS |SALARY      
+-----
+99 |smith |tennis"p,l,ayer" |190.55      
+99 |smith |tennis"p,l,ayer" |190.55      
+100 |smith |tennis"player" |190.55      
+101 |smith |tennis"player |190.55      
+102 |smith |"tennis"player |190.55      
+103 |smith |"tennis"player" |190.55      
+104 |smith |"tennis"""""""""""""""""""""""""""""""""""""player" |NULL        
+105 |smith |"" |190.55      
+106 |smith |""""""""""""""""""" |190.55      
+107 |smith" |NULL |190.55      
+108 |NULL |NULL |NULL        
+ij> --checking query
+select count(*) from imp_emp, ex_emp
+      where ex_emp.id = imp_emp.id and
+      (ex_emp.skills=imp_emp.skills or
+      (ex_emp.skills is NULL and imp_emp.skills is NULL));
+1          
+-----
+11         
+ij> delete from imp_emp where id < 105;
+7 rows inserted/updated/deleted
+ij> --export from ex_emp using the a query only rows that got deleted in imp_emp 
+call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from ex_emp where id < 105', 
+                                    'extinout/emp.dat' , null, null, null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+                                      null, null, null, 0) ;
+Statement executed.
+ij> --checking query
+select count(*) from imp_emp, ex_emp
+      where ex_emp.id = imp_emp.id and
+      (ex_emp.skills=imp_emp.skills or
+      (ex_emp.skills is NULL and imp_emp.skills is NULL));
+1          
+-----
+10         
+ij> --export the columns in different column order than in the table.
+call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select name , salary , skills, id from ex_emp where id < 105', 
+                                    'extinout/emp.dat' , null, null, null) ;
+Statement executed.
+ij> -- import them in to a with order different than in the table;
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_emp' ,'name, salary, skills, id', null,
+                                    'extinout/emp.dat', null, null, null, 1) ;
+Statement executed.
+ij> --check query
+select count(*) from imp_emp, ex_emp
+      where ex_emp.id = imp_emp.id and
+      (ex_emp.skills=imp_emp.skills or
+      (ex_emp.skills is NULL and imp_emp.skills is NULL));
+1          
+-----
+6          
+ij> -- do import replace into the table with table order but using column indexes
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_emp' ,null, '4, 1, 3, 2',
+                                    'extinout/emp.dat', null, null, null, 1) ;
+Statement executed.
+ij> --check query
+select count(*) from imp_emp, ex_emp
+      where ex_emp.id = imp_emp.id and
+      (ex_emp.skills=imp_emp.skills or
+      (ex_emp.skills is NULL and imp_emp.skills is NULL));
+1          
+-----
+6          
+ij> --replace using insert column names and column indexes
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'imp_emp' ,'salary, id, skills, name', '2, 4, 3, 1',
+                                    'extinout/emp.dat', null, null, null, 1) ;
+Statement executed.
+ij> --check query
+select count(*) from imp_emp, ex_emp
+      where ex_emp.id = imp_emp.id and
+      (ex_emp.skills=imp_emp.skills or
+      (ex_emp.skills is NULL and imp_emp.skills is NULL));
+1          
+-----
+6          
+ij> ---testing with different delimiters
+----- single quote(') as character delimiter
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+                                    null, '''', null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+                                    null, '''', null, 1) ;
+Statement executed.
+ij> select * from imp_emp ;
+ID |NAME |SKILLS |SALARY      
+-----
+99 |smith |tennis"p,l,ayer" |190.55      
+100 |smith |tennis"player" |190.55      
+101 |smith |tennis"player |190.55      
+102 |smith |"tennis"player |190.55      
+103 |smith |"tennis"player" |190.55      
+104 |smith |"tennis"""""""""""""""""""""""""""""""""""""player" |NULL        
+105 |smith |"" |190.55      
+106 |smith |""""""""""""""""""" |190.55      
+107 |smith" |NULL |190.55      
+108 |NULL |NULL |NULL        
+ij> -- single quote(') as column delimiter
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+                                    '''',null, null) ;
+Statement executed.
+ij> delete from imp_emp ;
+10 rows inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'imp_emp' , 'extinout/emp.dat' , 
+                                    '''', null, null, 0) ;
+Statement executed.
+ij> select * from imp_emp;
+ID |NAME |SKILLS |SALARY      
+-----
+99 |smith |tennis"p,l,ayer" |190.55      
+100 |smith |tennis"player" |190.55      
+101 |smith |tennis"player |190.55      
+102 |smith |"tennis"player |190.55      
+103 |smith |"tennis"player" |190.55      
+104 |smith |"tennis"""""""""""""""""""""""""""""""""""""player" |NULL        
+105 |smith |"" |190.55      
+106 |smith |""""""""""""""""""" |190.55      
+107 |smith" |NULL |190.55      
+108 |NULL |NULL |NULL        
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+                                 '*', '%', null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ex_emp' , 'extinout/emp.dat' , 
+                                 '*', '%', null, 1) ;
+Statement executed.
+ij> select * from imp_emp ;
+ID |NAME |SKILLS |SALARY      
+-----
+99 |smith |tennis"p,l,ayer" |190.55      
+100 |smith |tennis"player" |190.55      
+101 |smith |tennis"player |190.55      
+102 |smith |"tennis"player |190.55      
+103 |smith |"tennis"player" |190.55      
+104 |smith |"tennis"""""""""""""""""""""""""""""""""""""player" |NULL        
+105 |smith |"" |190.55      
+106 |smith |""""""""""""""""""" |190.55      
+107 |smith" |NULL |190.55      
+108 |NULL |NULL |NULL        
+ij> --cases for identity columns
+-----create table emp1(id int generated always as identity (start with 100), name char(7), 
+-----              skills varchar(200), salary decimal(10,2),skills varchar(200));
+-----check import export with real and double that can not be explictitly
+-----casted from VARCHAR type .
+create table noncast(c1 double , c2 real ) ;
+0 rows inserted/updated/deleted
+ij> insert into noncast values(1.5 , 6.7 ) ;
+1 row inserted/updated/deleted
+ij> insert into noncast values(2.5 , 8.999) ;
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP' , 'noncast' , 'extinout/noncast.dat'  , null , null , null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'noncast' , 'extinout/noncast.dat'  , null , null , null , 0) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'noncast', 'c2 , c1' , '2, 1' , 
+                                   'extinout/noncast.dat'  , null , null , null , 0) ;
+Statement executed.
+ij> select * from noncast ;
+C1 |C2           
+-----
+1.5 |6.7          
+2.5 |8.999        
+1.5 |6.7          
+2.5 |8.999        
+1.5 |6.7          
+2.5 |8.999        
+ij> --check import/export of time types
+CREATE TABLE   TTYPES(DATETYPE DATE, TIMETYPE TIME, TSTAMPTYPE TIMESTAMP );
+0 rows inserted/updated/deleted
+ij> insert into ttypes values('1999-09-09' , '12:15:19' , 'xxxxxxFILTERED-TIMESTAMPxxxxx);
+1 row inserted/updated/deleted
+ij> insert into ttypes values('2999-12-01' , '13:16:10' , 'xxxxxxFILTERED-TIMESTAMPxxxxx);
+1 row inserted/updated/deleted
+ij> insert into ttypes values('3000-11-02' , '14:17:21' , 'xxxxxxFILTERED-TIMESTAMPxxxxx);
+1 row inserted/updated/deleted
+ij> insert into ttypes values('2004-04-03' , '15:18:31' , 'xxxxxxFILTERED-TIMESTAMPxxxxx);
+1 row inserted/updated/deleted
+ij> insert into ttypes values(null , null , null);
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'ttypes' , 'extinout/ttypes.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ttypes' , 'extinout/ttypes.del' , 
+                                 null, null, null, 0) ;
+Statement executed.
+ij> select * from ttypes;
+DATETYPE |TIMETYPE |TSTAMPTYPE                
+-----
+1999-09-09 |12:15:19 |xxxxxxFILTERED-TIMESTAMPxxxxx
+2999-12-01 |13:16:10 |xxxxxxFILTERED-TIMESTAMPxxxxx
+3000-11-02 |14:17:21 |xxxxxxFILTERED-TIMESTAMPxxxxx
+2004-04-03 |15:18:31 |xxxxxxFILTERED-TIMESTAMPxxxxx
+NULL |NULL |NULL                      
+1999-09-09 |12:15:19 |xxxxxxFILTERED-TIMESTAMPxxxxx
+2999-12-01 |13:16:10 |xxxxxxFILTERED-TIMESTAMPxxxxx
+3000-11-02 |14:17:21 |xxxxxxFILTERED-TIMESTAMPxxxxx
+2004-04-03 |15:18:31 |xxxxxxFILTERED-TIMESTAMPxxxxx
+NULL |NULL |NULL                      
+ij> ---Import should commit on success and rollback on any failures
+autocommit off ;
+ij> create table t1(a int ) ;
+0 rows inserted/updated/deleted
+ij> insert into t1 values(1) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(2) ;
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+                                 null, null, null, 0) ;
+Statement executed.
+ij> --above import should have committed , following rollback should be a noop.
+rollback;
+ij> select * from t1;
+A          
+-----
+1          
+2          
+1          
+2          
+ij> insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> --file not found error should rollback 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/nofile.del' , 
+                                 null, null, null, 0) ;
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE04: Data file not found: extinout/nofile.del
+ij> commit;
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+1          
+2          
+ij> insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> --table not found error should issue a implicit rollback 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'notable' , 'extinout/t1.del' , 
+                                 null, null, null, 0) ;
+ERROR XIE0M: Table 'NOTABLE' does not exist.
+ij> commit ;
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+1          
+2          
+ij> delete from t1;
+4 rows inserted/updated/deleted
+ij> ---check commit/rollback with replace options using 
+insert into t1 values(1) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(2) ;
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> --above export should have a commit.rollback below should be a noop
+rollback;
+ij> select * from t1;
+A          
+-----
+1          
+2          
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+                                 null, null, null, 1) ;
+Statement executed.
+ij> --above import should have committed , following rollback should be a noop.
+rollback;
+ij> select * from t1;
+A          
+-----
+1          
+2          
+ij> insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> --file not found error should rollback 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 't1' , 'extinout/nofile.del' , 
+                                 null, null, null, 1) ;
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE04: Data file not found: extinout/nofile.del
+ij> commit;
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+ij> insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> --table not found error should issue a implicit rollback 
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'notable' , 'extinout/t1.del' , 
+                                 null, null, null, 1) ;
+ERROR XIE0M: Table 'NOTABLE' does not exist.
+ij> commit ;
+ij> ---check IMPORT_DATA calls commit/rollback
+select * from t1 ;
+A          
+-----
+1          
+2          
+ij> delete from t1;
+2 rows inserted/updated/deleted
+ij> ---check commit/rollback with replace options using 
+insert into t1 values(1) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(2) ;
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 't1' , 'extinout/t1.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1' , 'a' , '1' , 'extinout/t1.del' , 
+                                 null, null, null, 0) ;
+Statement executed.
+ij> --above import should have committed , following rollback should be a noop.
+rollback;
+ij> select * from t1;
+A          
+-----
+1          
+2          
+1          
+2          
+ij> insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> --file not found error should rollback 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1', 'a' , '1'  , 'extinout/nofile.del' , 
+                                 null, null, null, 0) ;
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE04: Data file not found: extinout/nofile.del
+ij> commit;
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+1          
+2          
+ij> insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> --table not found error should issue a implicit rollback 
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'notable' , 'a' , '1', 'extinout/t1.del' , 
+                                 null, null, null, 1) ;
+ERROR XIE0M: Table 'NOTABLE' does not exist.
+ij> commit ;
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+1          
+2          
+ij> autocommit on ;
+ij> --make sure commit import code is ok in autcommit mode.
+insert into t1 values(3) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(4) ;
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1' , 'a' , '1' , 'extinout/t1.del' , 
+                                 null, null, null, 0) ;
+Statement executed.
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+1          
+2          
+3          
+4          
+1          
+2          
+ij> insert into t1 values(5) ;
+1 row inserted/updated/deleted
+ij> insert into t1 values(6) ;
+1 row inserted/updated/deleted
+ij> --following import will back , but should not have any impact on inserts
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 't1', 'a' , '1'  , 'extinout/nofile.del' , 
+                                 null, null, null, 0) ;
+ERROR 38000: The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE04: Data file not found: extinout/nofile.del
+ij> select * from t1 ;
+A          
+-----
+1          
+2          
+1          
+2          
+3          
+4          
+1          
+2          
+5          
+6          
+ij> --END IMPORT COMMIT/ROLLBACK TESTSING
+-----all types supported by DB2 cloudscape import/export
+create table alltypes(chartype char(20) , 
+	          biginttype bigint , 
+		  datetype date , 
+		  decimaltype decimal(10,5) , 
+		  doubletype double , 
+		  inttype integer , 
+		  lvartype long varchar , 
+		  realtype real , 
+		  sminttype smallint , 
+		  timetype time , 
+		  tstamptype timestamp , 
+		  vartype varchar(50));
+0 rows inserted/updated/deleted
+ij> insert into  alltypes values('chartype string' ,
+                          9223372036854775807,
+                         '1993-10-29' ,
+                          12345.54321,
+                          10E307,
+                          2147483647,
+                          'long varchar testing',
+                          10E3,
+                          32767,
+                          '09.39.43',
+                          'xxxxxxFILTERED-TIMESTAMPxxxxx,
+                          'varchar testing');
+1 row inserted/updated/deleted
+ij> insert into  alltypes values('chartype string' ,
+                          -9223372036854775808,
+                         '1993-10-29' ,
+                          0.0,
+                          -10E307,
+                          -2147483647,
+                          'long varchar testing',
+                          -10E3,
+                          32767,
+                          '09.39.43',
+                          'xxxxxxFILTERED-TIMESTAMPxxxxx,
+                          'varchar testing');
+1 row inserted/updated/deleted
+ij> insert into  alltypes values('"chartype" string' , 
+                              9223372036854775807,
+                             '1993-10-29' , 
+                              -12345.54321,
+                              10E307,
+                              2147483647,
+                              'long "varchar" testing',
+                              10E3,
+                              32767,
+                              '09.39.43',
+                              'xxxxxxFILTERED-TIMESTAMPxxxxx,
+                              '"varchar" testing');
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+                                 null, null, null, 0) ;
+Statement executed.
+ij> select * from alltypes ;
+CHARTYPE |BIGINTTYPE |DATETYPE |DECIMALTYPE |DOUBLETYPE |INTTYPE |LVARTYPE |REALTYPE |SMINT& |TIMETYPE |TSTAMPTYPE |VARTYPE                                           
+-----
+chartype string |9223372036854775807 |1993-10-29 |12345.54321 |1.0E308 |2147483647 |long varchar testing |10000.0 |32767 |09:39:43 |xxxxxxFILTERED-TIMESTAMPxxxxx |varchar testing                                   
+chartype string |-9223372036854775808 |1993-10-29 |0.00000 |-1.0E308 |-2147483647 |long varchar testing |-10000.0 |32767 |09:39:43 |xxxxxxFILTERED-TIMESTAMPxxxxx |varchar testing                                   
+"chartype" string |9223372036854775807 |1993-10-29 |-12345.54321 |1.0E308 |2147483647 |long "varchar" testing |10000.0 |32767 |09:39:43 |xxxxxxFILTERED-TIMESTAMPxxxxx |"varchar" testing                                 
+chartype string |9223372036854775807 |1993-10-29 |12345.54321 |1.0E308 |2147483647 |long varchar testing |10000.0 |32767 |09:39:43 |xxxxxxFILTERED-TIMESTAMPxxxxx |varchar testing                                   
+chartype string |-9223372036854775808 |1993-10-29 |0.00000 |-1.0E308 |-2147483647 |long varchar testing |-10000.0 |32767 |09:39:43 |xxxxxxFILTERED-TIMESTAMPxxxxx |varchar testing                                   
+"chartype" string |9223372036854775807 |1993-10-29 |-12345.54321 |1.0E308 |2147483647 |long "varchar" testing |10000.0 |32767 |09:39:43 |xxxxxxFILTERED-TIMESTAMPxxxxx |"varchar" testing                                 
+ij> delete from alltypes;
+6 rows inserted/updated/deleted
+ij> --import should work with trigger enabled on append and should not work on replace
+create table test1(a char(20)) ;
+0 rows inserted/updated/deleted
+ij> create trigger trig_import after INSERT on alltypes
+referencing new as newrow
+for each  row mode db2sql
+insert into test1 values(newrow.chartype);
+0 rows inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+                                 null, null, null, 0) ;
+Statement executed.
+ij> select count(*) from alltypes ;
+1          
+-----
+3          
+ij> select * from test1;
+A                   
+-----
+chartype string     
+chartype string     
+"chartype" string   
+ij> delete from alltypes;
+3 rows inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'alltypes' , 'extinout/alltypes.del' , 
+                                 null, null, null, 1) ;
+ERROR 38000: The exception 'SQL Exception: Bulk insert replace is not permitted on 'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT).' was thrown while evaluating an expression. SQLSTATE: 42Z08: Bulk insert replace is not permitted on 'APP.ALLTYPES' because it has an enabled trigger (TRIG_IMPORT).
+ij> select count(*) from alltypes;
+1          
+-----
+0          
+ij> drop trigger trig_import;
+0 rows inserted/updated/deleted
+ij> drop table test1;
+0 rows inserted/updated/deleted
+ij> --test importing to identity columns
+create table table1(c1 char(30), 
+       c2 int generated always as identity,
+       c3 real,
+       c4 char(1));
+0 rows inserted/updated/deleted
+ij> create table table2(c1 char(30), 
+       c2 int,
+       c3 real,
+       c4 char(1));
+0 rows inserted/updated/deleted
+ij> insert into table2 values('Robert',100, 45.2, 'J');
+1 row inserted/updated/deleted
+ij> insert into table2 values('Mike',101, 76.9, 'K');
+1 row inserted/updated/deleted
+ij> insert into table2 values('Leo',102, 23.4, 'I');
+1 row inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select c1,c3,c4 from table2' , 'extinout/import.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL,'table1', 'c1,c3,c4' , null, 'extinout/import.del',null, null,null,0);
+Statement executed.
+ij> select * from table1;
+C1 |C2 |C3 |C4  
+-----
+Robert |1 |45.2 |J   
+Mike |2 |76.9 |K   
+Leo |3 |23.4 |I   
+ij> delete from table1;
+3 rows inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null , 'table2' , 'extinout/import.del',  null, null, null) ;
+Statement executed.
+ij> --following import should fail becuase of inserting into identity column.
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'table1', 'extinout/import.del',null, null, null,1);
+ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'C2'.' was thrown while evaluating an expression. SQLSTATE: 42Z23: Attempt to modify an identity column 'C2'. 
+ij> --following import should be succesful
+CALL SYSCS_UTIL.SYSCS_IMPORT_DATA(NULL, 'table1', 'c1,c3,c4' , '1,3,4', 'extinout/import.del',null, null, null,1);
+Statement executed.
+ij> select * from table1;
+C1 |C2 |C3 |C4  
+-----
+Robert |1 |45.2 |J   
+Mike |2 |76.9 |K   
+Leo |3 |23.4 |I   
+ij> update table2 set c2=null;
+3 rows inserted/updated/deleted
+ij> --check null values import to identity columns should also fail
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE(null , 'table2' , 'extinout/import.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'table1', 'extinout/import.del',null, null, null,1);
+ERROR 38000: The exception 'SQL Exception: Attempt to modify an identity column 'C2'.' was thrown while evaluating an expression. SQLSTATE: 42Z23: Attempt to modify an identity column 'C2'. 
+ij> select * from table1;
+C1 |C2 |C3 |C4  
+-----
+Robert |1 |45.2 |J   
+Mike |2 |76.9 |K   
+Leo |3 |23.4 |I   
+ij> --check that replace fails when there dependents and replaced data 
+-----does not violate foreign key constraints.
+create table parent(a int not null primary key);
+0 rows inserted/updated/deleted
+ij> insert into parent values (1) , (2) , (3) , (4) ;
+4 rows inserted/updated/deleted
+ij> create table child(b int references parent(a));
+0 rows inserted/updated/deleted
+ij> insert into child values (1) , (2) , (3) , (4) ;
+4 rows inserted/updated/deleted
+ij> call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select * from parent where a < 3' , 'extinout/parent.del' , 
+                                 null, null, null) ;
+Statement executed.
+ij> --replace should fail because of dependent table
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'parent', 'extinout/parent.del',null, null, null,1);
+ERROR 38000: The exception 'SQL Exception: INSERT on table 'PARENT' caused a violation of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled back.' was thrown while evaluating an expression. SQLSTATE: 23503: INSERT on table 'PARENT' caused a violation of foreign key constraint 'xxxxGENERATED-IDxxxx' for key (3).  The statement has been rolled back.
+ij> select * from parent;
+A          
+-----
+1          
+2          
+3          
+4          
+ij> ---test with a file which has a differen records seperators (\n, \r , \r\n)
+create table nt1( a int , b char(30));
+0 rows inserted/updated/deleted
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE(NULL, 'nt1', 'extin/mixednl.del',null, null, null,0);
+Statement executed.
+ij> select * from nt1;
+A |B                             
+-----
+0 |XXXXXX0                       
+1 |XXXXXX1                       
+2 |XXXXXX2                       
+3 |XXXXXX3                       
+4 |XXXXXX4                       
+5 |YYYYY5                        
+6 |YYYYY6                        
+7 |YYYYY7                        
+8 |YYYYY8                        
+9 |YYYYY9                        
+10 |ZZZZZZ10                      
+11 |ZZZZZZ11                      
+12 |ZZZZZZ12                      
+13 |ZZZZZZ13                      
+14 |ZZZZZZ14                      
+ij> drop table nt1 ;
+0 rows inserted/updated/deleted
+ij> --test case for bug 5977;(with lot of text data)
+create table position_info
+    (
+       position_code varchar(10) not null ,
+       literal_no int not null ,
+       job_category_code varchar(10),
+       summary_description long varchar,
+       detail_description long varchar,
+       web_flag varchar(1)
+    );
+0 rows inserted/updated/deleted
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'position_info', 'extin/position_info.del',
+                                    null, null, null, 1);
+Statement executed.
+ij> select count(*) from position_info ;
+1          
+-----
+680        
+ij> select detail_description from position_info where position_code='AG1000';
+DETAIL_DESCRIPTION                                                                                                              
+-----
+Essential Duties and Responsibilities (include but not limited to):
+*Assist the director in his work activities in leading the&
+ij> CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE ('APP', 'position_info', 'extinout/pinfo.del',
+                                    null, null, null);
+Statement executed.
+ij> delete from position_info;
+680 rows inserted/updated/deleted
+ij> CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE ('APP', 'position_info', 'extinout/pinfo.del',
+                                    null, null, null, 1);
+Statement executed.
+ij> select count(*) from position_info ;
+1          
+-----
+680        
+ij> select detail_description from position_info where position_code='AG1000';
+DETAIL_DESCRIPTION                                                                                                              
+-----
+Essential Duties and Responsibilities (include but not limited to):
+*Assist the director in his work activities in leading the&
+ij> 

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ieptests.out
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out?view=auto&rev=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out (added)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out Wed Feb  2 17:58:27 2005
@@ -0,0 +1,25 @@
+Test importExport starting
+testing non-existing data file
+The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE04: Data file not found: extinout/Z.dat
+testing null data file
+The exception 'SQL Exception: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression.' was thrown while evaluating an expression. SQLSTATE: 38000: The exception 'java.lang.reflect.InvocationTargetException' was thrown while evaluating an expression. SQLSTATE: XJ001: Java exception: ': java.lang.reflect.InvocationTargetException'. SQLSTATE: XIE05: Data file can not be null.
+testing empty table
+testing empty table with Delimited format
+testing empty table import Field/Char Delimiters
+PASS: setup complete
+testing import/export with default options
+testing IE with code set 8859_1
+testing IE with delimiter and codeset
+testing IE with delimiters(%, &) and Cp1252
+testing IE with delimiters(%, &) and UTF-16
+testing IE with delimiters(^, #) and WRONG ENCODEINGH
+Got IOException while writing data to the file
+testing datatypes that does not have Export Supprt
+Column 'C1' in the table is of type BLOB, it is not supported by import/export.
+Column 'C1' in the table is of type BLOB, it is not supported by import/export.
+The exception 'SQL Exception: Read endOfFile at unexpected place on line 2' was thrown while evaluating an expression. SQLSTATE: XIE0E: Read endOfFile at unexpected place on line 2
+PASS: finished testing import and export
+PASS: teardown complete
+PASS: finished cleaning up the temporary objects from database
+PASS
+Test importExport finished

Propchange: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/importExport.out
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out?view=diff&r1=151099&r2=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadataJdbc20.out Wed Feb  2 17:58:27 2005
@@ -1,6 +1,6 @@
 Test metadataJdbc20 starting
 JDBC Driver 'IBM DB2 JDBC Universal Driver Architecture', version (EXPECTED VERSION)
-The URL is: jdbc:derby:net://localhost:1527/wombat;create=true
+The URL is: jdbc:derby://localhost:1527/wombat;create=true
 getUDTs() with user-named types null :
 TYPE_CAT,TYPE_SCHEM,TYPE_NAME,CLASS_NAME,DATA_TYPE,REMARKS
 getUDTs() with user-named types in ('JAVA_OBJECT') :

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out?view=diff&r1=151099&r2=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out Wed Feb  2 17:58:27 2005
@@ -248,7 +248,7 @@
 A |B |C                   
 -----
 70 |831 |45.700              
-EXPECTED SQL Exception: BigDecimal conversion exception [ibm][db2][jcc][converters] Overflow occurred during numeric data type conversion of "10243".. See attached Throwable.
+EXPECTED SQL Exception: BigDecimal conversion exception [converters] Overflow occurred during numeric data type conversion of "10243".. See attached Throwable.
 A |B |C                   
 -----
 80 |993 |1234.567            
@@ -329,7 +329,7 @@
 No ResultSet or update count returned
 OP4INOUT 9+23.505 >32.50< null ? false
 EXPECTED SQL Exception: The resulting value is outside the range for the data type DECIMAL/NUMERIC(4,2).
-EXPECTED SQL Exception: BigDecimal conversion exception [ibm][db2][jcc][converters] Overflow occurred during numeric data type conversion of "102.33".. See attached Throwable.
+EXPECTED SQL Exception: BigDecimal conversion exception [converters] Overflow occurred during numeric data type conversion of "102.33".. See attached Throwable.
 EXPECTED SQL Exception: (<NULL>) Invalid operation: parameter 1 not set or registered
 SQL Control
 CREATE PROCEDURE SQLC.SQLCONTROL1_0 (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))  PARAMETER STYLE JAVA LANGUAGE JAVA EXTERNAL NAME 'org.apache.derbyTesting.functionTests.util.ProcedureTest.sqlControl'

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out?view=diff&r1=151099&r2=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out Wed Feb  2 17:58:27 2005
@@ -98,11 +98,11 @@
 ij(CONNECTION3)> -- Invalid ones:
 connect 'wombat;user=Jamie;password=theHooligan';
 ij(CONNECTION4)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4* - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=jeff;password=homeRun
+CONNECTION2 - 	jdbc:derby://localhost:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION4* - 	jdbc:derby://localhost:1527/wombat;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION4)> connect 'guestSchemeDB;user=kreg;password=IwasBornReady';
 ij(CONNECTION5)> connect 'guestSchemeDB;user=jeff;password=homeRun';
@@ -111,16 +111,16 @@
 ij(CONNECTION8)> -- Invalid ones:
 connect 'guestSchemeDB;user=Jamie;password=theHooligan';
 ij(CONNECTION9)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
-CONNECTION6 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
-CONNECTION7 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
-CONNECTION8 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
-CONNECTION9* - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=jeff;password=homeRun
+CONNECTION2 - 	jdbc:derby://localhost:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION4 - 	jdbc:derby://localhost:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION5 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
+CONNECTION6 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
+CONNECTION7 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
+CONNECTION8 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
+CONNECTION9* - 	jdbc:derby://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION9)> connect 'derbySchemeDB;user=mamta;password=ieScape';
 ij(CONNECTION10)> connect 'derbySchemeDB;user=dan;password=makeItFaster';
@@ -131,19 +131,19 @@
 ij(CONNECTION12)> connect 'derbySchemeDB;user=francois;password=paceesalute';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION12)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION10 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION11 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION12* - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
-CONNECTION6 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
-CONNECTION7 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
-CONNECTION8 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
-CONNECTION9 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=jeff;password=homeRun
+CONNECTION10 - 	jdbc:derby://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION11 - 	jdbc:derby://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION12* - 	jdbc:derby://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION2 - 	jdbc:derby://localhost:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION4 - 	jdbc:derby://localhost:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION5 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
+CONNECTION6 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
+CONNECTION7 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
+CONNECTION8 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
+CONNECTION9 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION12)> connect 'simpleSchemeDB;user=jeff;password=homeRun';
 ij(CONNECTION13)> connect 'simpleSchemeDB;user=howardR;password=takeItEasy';
@@ -159,22 +159,22 @@
 ij(CONNECTION15)> connect 'simpleSchemeDB;user=francois;password=corsica';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION15)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=homeRun
-CONNECTION10 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
-CONNECTION11 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
-CONNECTION12 - 	jdbc:derby:net://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
-CONNECTION13 - 	jdbc:derby:net://localhost:1527/simpleSchemeDB;user=jeff;password=homeRun
-CONNECTION14 - 	jdbc:derby:net://localhost:1527/simpleSchemeDB;user=howardR;password=takeItEasy
-CONNECTION15* - 	jdbc:derby:net://localhost:1527/simpleSchemeDB;user=francois;password=paceesalute
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=takeItEasy
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=Jamie;password=theHooligan
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
-CONNECTION6 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
-CONNECTION7 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
-CONNECTION8 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
-CONNECTION9 - 	jdbc:derby:net://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;create=true;user=kreg;password=IwasBornReady
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=jeff;password=homeRun
+CONNECTION10 - 	jdbc:derby://localhost:1527/derbySchemeDB;user=mamta;password=ieScape
+CONNECTION11 - 	jdbc:derby://localhost:1527/derbySchemeDB;user=dan;password=makeItFaster
+CONNECTION12 - 	jdbc:derby://localhost:1527/derbySchemeDB;user=martin;password=obfuscateIt
+CONNECTION13 - 	jdbc:derby://localhost:1527/simpleSchemeDB;user=jeff;password=homeRun
+CONNECTION14 - 	jdbc:derby://localhost:1527/simpleSchemeDB;user=howardR;password=takeItEasy
+CONNECTION15* - 	jdbc:derby://localhost:1527/simpleSchemeDB;user=francois;password=paceesalute
+CONNECTION2 - 	jdbc:derby://localhost:1527/wombat;user=howardR;password=takeItEasy
+CONNECTION3 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION4 - 	jdbc:derby://localhost:1527/wombat;user=Jamie;password=theHooligan
+CONNECTION5 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=kreg;password=IwasBornReady
+CONNECTION6 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=jeff;password=homeRun
+CONNECTION7 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=howardR;password=takeItEasy
+CONNECTION8 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=francois;password=paceesalute
+CONNECTION9 - 	jdbc:derby://localhost:1527/guestSchemeDB;user=Jamie;password=theHooligan
 * = current connection
 ij(CONNECTION15)> disconnect all;
 ij> show connections;

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out?view=diff&r1=151099&r2=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out Wed Feb  2 17:58:27 2005
@@ -36,11 +36,11 @@
 ij(CONNECTION2)> connect 'wombat;user=howardR;password=IamBetterAtTennis';
 ij(CONNECTION3)> connect 'wombat;user=francois;password=paceesalute';
 ij(CONNECTION4)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=kreg;password=visualWhat?
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=HomeRun61
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=ames;password=AnyVolunteer?
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=IamBetterAtTennis
-CONNECTION4* - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=kreg;password=visualWhat?
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=jeff;password=HomeRun61
+CONNECTION2 - 	jdbc:derby://localhost:1527/wombat;user=ames;password=AnyVolunteer?
+CONNECTION3 - 	jdbc:derby://localhost:1527/wombat;user=howardR;password=IamBetterAtTennis
+CONNECTION4* - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
 * = current connection
 ij(CONNECTION4)> disconnect all;
 ij> -- check allowed users in myDB db.
@@ -84,12 +84,12 @@
 ij(CONNECTION5)> update APP.t1 set c1 = USER;
 ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'APP.T1'.
 ij(CONNECTION5)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/myDB;user=kreg;password=visualWhat?
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/myDB;user=ames;password=AnyVolunteer?
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/myDB;user=dan;password=MakeItFaster
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/myDB;user=francois;password=paceesalute
-CONNECTION5* - 	jdbc:derby:net://localhost:1527/myDB;user=jamie;password=MrNamePlates
+CONNECTION0 - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION1 - 	jdbc:derby://localhost:1527/myDB;user=kreg;password=visualWhat?
+CONNECTION2 - 	jdbc:derby://localhost:1527/myDB;user=ames;password=AnyVolunteer?
+CONNECTION3 - 	jdbc:derby://localhost:1527/myDB;user=dan;password=MakeItFaster
+CONNECTION4 - 	jdbc:derby://localhost:1527/myDB;user=francois;password=paceesalute
+CONNECTION5* - 	jdbc:derby://localhost:1527/myDB;user=jamie;password=MrNamePlates
 * = current connection
 ij(CONNECTION5)> disconnect all;
 ij> --
@@ -127,8 +127,8 @@
 ij(CONNECTION1)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
 ERROR 04501: 04501.CDatabase connection refused.((server log XXX)
 ij(CONNECTION1)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION1* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION1* - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
 * = current connection
 ij(CONNECTION1)> -- Database shutdown - check user - should succeed
 ----- beetle 5367
@@ -137,8 +137,8 @@
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu;shutdown=true';
 ERROR 08006: myDB08006.DDatabase 'myDB' shutdown.((server log XXX)
 ij(CONNECTION1)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION1* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION1* - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
 * = current connection
 ij(CONNECTION1)> -- JBMS System shutdown - check user - should fail
 connect ';user=jamie;password=LetMeIn;shutdown=true';

Modified: incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
URL: http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out?view=diff&r1=151099&r2=151100
==============================================================================
--- incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out (original)
+++ incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out Wed Feb  2 17:58:27 2005
@@ -72,12 +72,12 @@
 ij(CONNECTION5)> create table APP.t2(c1 char(30));
 ERROR 25503: DDL is not permitted for a read-only connection, user or database.
 ij(CONNECTION5)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=system;password=manager
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=kreg;password=visualWhat?
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/wombat;user=jeff;password=HomeRun61
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/wombat;user=ames;password=AnyVolunteer?
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/wombat;user=howardR;password=IamBetterAtTennis
-CONNECTION5* - 	jdbc:derby:net://localhost:1527/wombat;user=jamie;password=MrNamePlates
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=system;password=manager
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=kreg;password=visualWhat?
+CONNECTION2 - 	jdbc:derby://localhost:1527/wombat;user=jeff;password=HomeRun61
+CONNECTION3 - 	jdbc:derby://localhost:1527/wombat;user=ames;password=AnyVolunteer?
+CONNECTION4 - 	jdbc:derby://localhost:1527/wombat;user=howardR;password=IamBetterAtTennis
+CONNECTION5* - 	jdbc:derby://localhost:1527/wombat;user=jamie;password=MrNamePlates
 * = current connection
 ij(CONNECTION5)> disconnect all;
 ij> -- check allowed users in myDB db.
@@ -169,13 +169,13 @@
 ij(CONNECTION6)> update APP.t1 set c1 = USER;
 ERROR 23513: The check constraint 'xxxxGENERATED-IDxxxx' was violated while performing an INSERT or UPDATE on table 'APP.T1'.
 ij(CONNECTION6)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/myDB;user=system;password=manager
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
-CONNECTION2 - 	jdbc:derby:net://localhost:1527/myDB;user=kreg;password=visualWhat?
-CONNECTION3 - 	jdbc:derby:net://localhost:1527/myDB;user=ames;password=AnyVolunteer?
-CONNECTION4 - 	jdbc:derby:net://localhost:1527/myDB;user=dan;password=MakeItFaster
-CONNECTION5 - 	jdbc:derby:net://localhost:1527/myDB;user=francois;password=paceesalute
-CONNECTION6* - 	jdbc:derby:net://localhost:1527/myDB;user=jamie;password=MrNamePlates
+CONNECTION0 - 	jdbc:derby://localhost:1527/myDB;user=system;password=manager
+CONNECTION1 - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION2 - 	jdbc:derby://localhost:1527/myDB;user=kreg;password=visualWhat?
+CONNECTION3 - 	jdbc:derby://localhost:1527/myDB;user=ames;password=AnyVolunteer?
+CONNECTION4 - 	jdbc:derby://localhost:1527/myDB;user=dan;password=MakeItFaster
+CONNECTION5 - 	jdbc:derby://localhost:1527/myDB;user=francois;password=paceesalute
+CONNECTION6* - 	jdbc:derby://localhost:1527/myDB;user=jamie;password=MrNamePlates
 * = current connection
 ij(CONNECTION6)> disconnect all;
 ij> --
@@ -201,7 +201,7 @@
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij> connect 'wombat;user=jamie;password=MrNamePlates';
 ij> show connections;
-CONNECTION0* - 	jdbc:derby:net://localhost:1527/wombat;user=jamie;password=MrNamePlates
+CONNECTION0* - 	jdbc:derby://localhost:1527/wombat;user=jamie;password=MrNamePlates
 * = current connection
 ij> connect 'wombat;user=francois;password=paceesalute';
 ij(CONNECTION1)> connect 'myDB;user=jerry;password=SacreBleu';
@@ -213,9 +213,9 @@
 ij(CONNECTION2)> connect 'wombat;user=jerry;password=SacreBleu;shutdown=true';
 ERROR (no SQLState): Connection authorization failure occurred.  Reason: userid invalid.
 ij(CONNECTION2)> show connections;
-CONNECTION0 - 	jdbc:derby:net://localhost:1527/wombat;user=jamie;password=MrNamePlates
-CONNECTION1 - 	jdbc:derby:net://localhost:1527/wombat;user=francois;password=paceesalute
-CONNECTION2* - 	jdbc:derby:net://localhost:1527/myDB;user=jerry;password=SacreBleu
+CONNECTION0 - 	jdbc:derby://localhost:1527/wombat;user=jamie;password=MrNamePlates
+CONNECTION1 - 	jdbc:derby://localhost:1527/wombat;user=francois;password=paceesalute
+CONNECTION2* - 	jdbc:derby://localhost:1527/myDB;user=jerry;password=SacreBleu
 * = current connection
 ij(CONNECTION2)> disconnect all;
 ij> show connections;



Mime
View raw message