db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r691859 - in /db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ testData/ testData/ImportExport/ tests/tools/
Date Thu, 04 Sep 2008 03:19:15 GMT
Author: myrnavl
Date: Wed Sep  3 20:19:14 2008
New Revision: 691859

URL: http://svn.apache.org/viewvc?rev=691859&view=rev
Log:
DERBY-3863; improve importexport ij test - backport 691820 from 10.2 (which was
  a modified backport from 10.3 etc) with  modification to copyfiles.ant to 
  ensure build happens on this branche.

Added:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out   (contents, props changed)
      - copied, changed from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties   (props changed)
      - copied unchanged from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
Modified:
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/copyfiles.ant
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport.java
    db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties

Copied: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out (from r691812, db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out)
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out?p2=db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out&p1=db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out&r1=691812&r2=691859&rev=691859&view=diff
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out Wed Sep  3 20:19:14 2008
@@ -49,7 +49,7 @@
 ij> -- second line of data file is not complete - should give error message re EOF
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extin/TwoLineBadEOF.dat' , 
                                     null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Read endOfFile at unexpected place on line 2.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Read endOfFile at unexpected place on line 2.' was thrown while evaluating an expression.
 ERROR XIE0E: Read endOfFile at unexpected place on line 2.
 ij> -- should work, default format (i.e. field sep , column delimiter ".)
 -- (last two lines have extra white space (tabs, spaces) which should not matter).
@@ -95,7 +95,7 @@
 ij> --this one should fail as we're still using the default import format
 call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T2' , 'extin/AccountData_format1.dat' , 
                                     null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Column 'COLUMN2' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN2' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN2' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN2' is not a column in the target table.' was thrown while evaluating an expression.
 ERROR 42X04: Column 'COLUMN2' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN2' is not a column in the target table.
 ij> values (SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'T2'));
 1          
@@ -135,10 +135,10 @@
                                   null , '16, 15, 1, 4, 19, 200' ,
 				  'extin/AccountData_defaultformat.dat' , 
 				  null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Column 'COLUMN200' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN200' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN200' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN200' is not a column in the target table.' was thrown while evaluating an expression.
 ERROR 42X04: Column 'COLUMN200' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN200' is not a column in the target table.
 ij> select count(*) from T3;
-ERROR 42X05: Table/View 'T3' does not exist.
+ERROR 42X05: Table 'T3' does not exist.
 ij> drop table T4;
 ERROR 42Y55: 'DROP TABLE' cannot be performed on 'T4' because it does not exist.
 ij> create table T4 (	Lname	char(30),
@@ -173,115 +173,115 @@
 -----------
 1          
 ij> select count(*) from T3;
-ERROR 42X05: Table/View 'T3' does not exist.
+ERROR 42X05: Table 'T3' does not exist.
 ij> select count(*) from T4;
 1          
 -----------
 35         
 ij> select * from T1 where State = 'CA';
-ACCOUNT    |NAME                          |JOBDESC                                 |COMPANY                            |ADDRESS1                                |ADDRESS2                                |CITY                |STATE|ZIP       |COUNTRY   |PHONE1              |PHONE2              |EMAIL                         |WEB                           |FNAME                         |LNAME                         |COMMENT                       |ACCDATE                       |PAYMENT   |BALANCE   
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-9          |Dizzy Ditzy                   |Director, Turnstyle Systems             |Dump Disk Systems                  |3 Highway 1                             |                                        |Round Robin         |CA   |99999     |          |533/533-5333        |                    |                              |                              |Dizzy                         |Ditzy                         |Unstable                      |2006-12-12                    |5.12      |3.33      
-15         |Bert Bobbins                  |Bobcat catcher                          |Wilden Park                        |5237 College Avenue                     |                                        |Oakland             |CA   |          |          |510/283-5183        |                    |bebob@wildenpark.com          |                              |Bert                          |Bobbins                       |Caught                        |2007-12-07                    |22100.20  |0.00      
-21         |Jason Aesonson                |V.P. Navigation                         |Argonauts                          |100 Sunset Blvd                         |                                        |Los Angeles         |CA   |90049     |          |213/213-2132        |213/213-2133        |jason@argonauts.com           |                              |Jason                         |Aesonson                      |Sailed off into sunset        |1998-01-01                    |0.00      |800.80    
-25         |Layne  Change                 |                                        |Streetwise Driving School          |                                        |Market Street                           |San Francisco       |CA   |95104     |          |415/415-4155        |                    |lach@nowhere.com              |                              |Layne                         |Change                        |Drove off                     |1998-01-01                    |0.00      |12003.27  
-28         |Les VanNess                   |Street Musician                         |Musical Temping Agency             |201 Van Ness Ave                        |                                        |San Francisco       |CA   |94102     |          |415-415-5555        |                    |                              |http://www.sfsymphonot.org    |Les                           |VanNess                       |Blown away                    |2007-01-01                    |90.93     |0.00      
-35         |Top  Hill                     |Architect                               |High Street Architects             |1001 High Street                        |                                        |Mountain View       |CA   |94041     |          |650/666-5500        |650/666-5501        |Top.Hill@higharc.com          |http://www.higharc.com        |Top                           |Hill                          |In the Clouds                 |2008-04-13                    |78.38     |0.00      
-36         |Trevor  MacGregor             |Garden Architect                        |High Street Architects             |1001 High Street                        |                                        |Mountain View       |CA   |94041     |          |650/666-5500        |650/666-5501        |Trevor.MacGregor@higharc.com  |                              |Trevor                        |MacGregor                     |Customer                      |2007-11-20                    |57.38     |0.01      
-37         |Vlad Zapad                    |                                        |Far West Trading Co.               |                                        |                                        |San Francisco       |CA   |94105     |          |415/415-1111        |415/415-1112        |vlad.zapad@fwtradingco.com    |http://www.fwtradingco.com    |Vlad                          |Zapad                         |Customer                      |2004-04-24                    |88.88     |88.88     
-38         |Marina  Fisher                |Real Estate Agent                       |Beach Realtors                     |                                        |                                        |Stinson Beach       |CA   |          |          |888 888 8888        |                    |                              |                              |Marina                        |Fisher                        |Customer                      |2007-12-13                    |777.77    |0.00      
-39         |Bill  Utterfly                |Photographer                            |Hot Shots Photography              |3 A Street, Apt. B                      |                                        |Mariposa            |CA   |95338     |          |666.666.6161        |                    |butterfly@shot.com            |http://www.shot.com           |Bill                          |Utterfly                      |Customer                      |2008-08-18                    |0.03      |0.02      
-43         |Santiago DePeru               |                                        |                                   |222 Fremont Street                      |                                        |Oakland             |CA   |94608     |U.S.A.    |510-511-5110        |510-511-5110        |santiago@nowhere.com          |Not in Peru                   |Santiago                      |DePeru                        |                              |2008-05-25                    |0.00      |0.00      
-44         |Margit Andersdottir           |                                        |                                   |333 Oakland Ave                         |                                        |Fremont             |CA   |94806     |U.S.A     |510-522-5220        |                    |                              |                              |Margit                        |Andersdottir                  |Customer                      |2008-09-19                    |15.15     |0.65      
-45         |Marie-Ange  LeCiel            |Chief Architect                         |Castle Air Structures              |                                        |1 Airport Drive                         |Castle              |CA   |95301     |          |209-209-209         |209-209-208         |                              |http://www.aircastles.com     |Marie-Ange                    |LeCiel                        |Customer                      |2008-11-13                    |200.00    |1800.00   
+ACCOUNT    |NAME                          |JOBDESC                                 |COMPANY                            |ADDRESS1                                |ADDRESS2                                |CITY                |STATE|ZIP       |COUNTRY   |PHONE1              |PHONE2              |EMAIL                         |WEB                           |FNAME                         |LNAME                         |COMMENT                       |ACCDATE                       |PAYMENT    |BALANCE    
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+9          |Dizzy Ditzy                   |Director, Turnstyle Systems             |Dump Disk Systems                  |3 Highway 1                             |                                        |Round Robin         |CA   |99999     |          |533/533-5333        |                    |                              |                              |Dizzy                         |Ditzy                         |Unstable                      |2006-12-12                    |5.12       |3.33       
+15         |Bert Bobbins                  |Bobcat catcher                          |Wilden Park                        |5237 College Avenue                     |                                        |Oakland             |CA   |          |          |510/283-5183        |                    |bebob@wildenpark.com          |                              |Bert                          |Bobbins                       |Caught                        |2007-12-07                    |22100.20   |0.00       
+21         |Jason Aesonson                |V.P. Navigation                         |Argonauts                          |100 Sunset Blvd                         |                                        |Los Angeles         |CA   |90049     |          |213/213-2132        |213/213-2133        |jason@argonauts.com           |                              |Jason                         |Aesonson                      |Sailed off into sunset        |1998-01-01                    |0.00       |800.80     
+25         |Layne  Change                 |                                        |Streetwise Driving School          |                                        |Market Street                           |San Francisco       |CA   |95104     |          |415/415-4155        |                    |lach@nowhere.com              |                              |Layne                         |Change                        |Drove off                     |1998-01-01                    |0.00       |12003.27   
+28         |Les VanNess                   |Street Musician                         |Musical Temping Agency             |201 Van Ness Ave                        |                                        |San Francisco       |CA   |94102     |          |415-415-5555        |                    |                              |http://www.sfsymphonot.org    |Les                           |VanNess                       |Blown away                    |2007-01-01                    |90.93      |0.00       
+35         |Top  Hill                     |Architect                               |High Street Architects             |1001 High Street                        |                                        |Mountain View       |CA   |94041     |          |650/666-5500        |650/666-5501        |Top.Hill@higharc.com          |http://www.higharc.com        |Top                           |Hill                          |In the Clouds                 |2008-04-13                    |78.38      |0.00       
+36         |Trevor  MacGregor             |Garden Architect                        |High Street Architects             |1001 High Street                        |                                        |Mountain View       |CA   |94041     |          |650/666-5500        |650/666-5501        |Trevor.MacGregor@higharc.com  |                              |Trevor                        |MacGregor                     |Customer                      |2007-11-20                    |57.38      |0.01       
+37         |Vlad Zapad                    |                                        |Far West Trading Co.               |                                        |                                        |San Francisco       |CA   |94105     |          |415/415-1111        |415/415-1112        |vlad.zapad@fwtradingco.com    |http://www.fwtradingco.com    |Vlad                          |Zapad                         |Customer                      |2004-04-24                    |88.88      |88.88      
+38         |Marina  Fisher                |Real Estate Agent                       |Beach Realtors                     |                                        |                                        |Stinson Beach       |CA   |          |          |888 888 8888        |                    |                              |                              |Marina                        |Fisher                        |Customer                      |2007-12-13                    |777.77     |0.00       
+39         |Bill  Utterfly                |Photographer                            |Hot Shots Photography              |3 A Street, Apt. B                      |                                        |Mariposa            |CA   |95338     |          |666.666.6161        |                    |butterfly@shot.com            |http://www.shot.com           |Bill                          |Utterfly                      |Customer                      |2008-08-18                    |0.03       |0.02       
+43         |Santiago DePeru               |                                        |                                   |222 Fremont Street                      |                                        |Oakland             |CA   |94608     |U.S.A.    |510-511-5110        |510-511-5110        |santiago@nowhere.com          |Not in Peru                   |Santiago                      |DePeru                        |                              |2008-05-25                    |0.00       |0.00       
+44         |Margit Andersdottir           |                                        |                                   |333 Oakland Ave                         |                                        |Fremont             |CA   |94806     |U.S.A     |510-522-5220        |                    |                              |                              |Margit                        |Andersdottir                  |Customer                      |2008-09-19                    |15.15      |0.65       
+45         |Marie-Ange  LeCiel            |Chief Architect                         |Castle Air Structures              |                                        |1 Airport Drive                         |Castle              |CA   |95301     |          |209-209-209         |209-209-208         |                              |http://www.aircastles.com     |Marie-Ange                    |LeCiel                        |Customer                      |2008-11-13                    |200.00     |1800.00    
 ij> select * from T2 where State = 'CA';
-ACCOUNT    |NAME                          |JOBDESC                                 |COMPANY                            |ADDRESS1                                |ADDRESS2                                |CITY                |STATE|ZIP       |COUNTRY   |PHONE1              |PHONE2              |EMAIL                         |WEB                           |FNAME                         |LNAME                         |COMMENT                       |ACCDATE                       |PAYMENT   |BALANCE   
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ACCOUNT    |NAME                          |JOBDESC                                 |COMPANY                            |ADDRESS1                                |ADDRESS2                                |CITY                |STATE|ZIP       |COUNTRY   |PHONE1              |PHONE2              |EMAIL                         |WEB                           |FNAME                         |LNAME                         |COMMENT                       |ACCDATE                       |PAYMENT    |BALANCE    
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 ij> select * from T4 where Fname = 'Georgiana' or Fname = 'Michael';
-LNAME                         |FNAME                         |ACCOUNT    |COMPANY                            |PAYMENT   |BALANCE   
------------------------------------------------------------------------------------------------------------------------------------
-George                        |Georgiana                     |6          |Georgianas Shortcuts               |50.25     |225.00    
-Leachim                       |Michael                       |17         |Musicians Temping Agency           |65.65     |0.00      
+LNAME                         |FNAME                         |ACCOUNT    |COMPANY                            |PAYMENT    |BALANCE    
+-------------------------------------------------------------------------------------------------------------------------------------
+George                        |Georgiana                     |6          |Georgianas Shortcuts               |50.25      |225.00     
+Leachim                       |Michael                       |17         |Musicians Temping Agency           |65.65      |0.00       
 ij> select Balance, Account, Company from T1 order by Balance;
-BALANCE   |ACCOUNT    |COMPANY                            
-----------------------------------------------------------
-0.00      |4          |Jakes Temps                        
-0.00      |5          |Floris Flowers                     
-0.00      |11         |Musicians Temping Agency           
-0.00      |12         |Smart Tegnologies                  
-0.00      |13         |Davids Diving                      
-0.00      |15         |Wilden Park                        
-0.00      |17         |Musicians Temping Agency           
-0.00      |23         |Smart Systems Software             
-0.00      |28         |Musical Temping Agency             
-0.00      |30         |Smart Systems Software             
-0.00      |33         |Pink Parrots Pet Shop              
-0.00      |35         |High Street Architects             
-0.00      |38         |Beach Realtors                     
-0.00      |40         |Super Swings, Inc.                 
-0.00      |43         |                                   
-0.01      |8          |Musicians Temping Agency           
-0.01      |36         |High Street Architects             
-0.02      |39         |Hot Shots Photography              
-0.12      |19         |Stevedores Galores                 
-0.65      |44         |                                   
-0.80      |10         |Carrs' Cars                        
-3.33      |9          |Dump Disk Systems                  
-12.00     |29         |Smart Systems Software             
-15.00     |42         |Musicians Temping Agency           
-30.20     |7          |                                   
-50.50     |2          |Diggs Diggings                     
-88.88     |37         |Far West Trading Co.               
-200.32    |1          |ABC Co                             
-225.00    |6          |Georgianas Shortcuts               
-768.74    |14         |Pink Parrots Pet Shop              
-800.80    |21         |Argonauts                          
-1800.00   |45         |Castle Air Structures              
-3009.28   |20         |Davids Diving                      
-5005.23   |3          |Divaddavid                         
-12003.27  |25         |Streetwise Driving School          
+BALANCE    |ACCOUNT    |COMPANY                            
+-----------------------------------------------------------
+0.00       |4          |Jakes Temps                        
+0.00       |5          |Floris Flowers                     
+0.00       |11         |Musicians Temping Agency           
+0.00       |12         |Smart Tegnologies                  
+0.00       |13         |Davids Diving                      
+0.00       |15         |Wilden Park                        
+0.00       |17         |Musicians Temping Agency           
+0.00       |23         |Smart Systems Software             
+0.00       |28         |Musical Temping Agency             
+0.00       |30         |Smart Systems Software             
+0.00       |33         |Pink Parrots Pet Shop              
+0.00       |35         |High Street Architects             
+0.00       |38         |Beach Realtors                     
+0.00       |40         |Super Swings, Inc.                 
+0.00       |43         |                                   
+0.01       |8          |Musicians Temping Agency           
+0.01       |36         |High Street Architects             
+0.02       |39         |Hot Shots Photography              
+0.12       |19         |Stevedores Galores                 
+0.65       |44         |                                   
+0.80       |10         |Carrs' Cars                        
+3.33       |9          |Dump Disk Systems                  
+12.00      |29         |Smart Systems Software             
+15.00      |42         |Musicians Temping Agency           
+30.20      |7          |                                   
+50.50      |2          |Diggs Diggings                     
+88.88      |37         |Far West Trading Co.               
+200.32     |1          |ABC Co                             
+225.00     |6          |Georgianas Shortcuts               
+768.74     |14         |Pink Parrots Pet Shop              
+800.80     |21         |Argonauts                          
+1800.00    |45         |Castle Air Structures              
+3009.28    |20         |Davids Diving                      
+5005.23    |3          |Divaddavid                         
+12003.27   |25         |Streetwise Driving School          
 ij> select Balance, Account, Company from T2 order by Balance;
-BALANCE   |ACCOUNT    |COMPANY                            
-----------------------------------------------------------
-200.32    |1          |ABC Co                             
+BALANCE    |ACCOUNT    |COMPANY                            
+-----------------------------------------------------------
+200.32     |1          |ABC Co                             
 ij> select Balance, Account, Company from T4 order by Balance;
-BALANCE   |ACCOUNT    |COMPANY                            
-----------------------------------------------------------
-0.00      |43         |                                   
-0.00      |38         |Beach Realtors                     
-0.00      |13         |Davids Diving                      
-0.00      |5          |Floris Flowers                     
-0.00      |35         |High Street Architects             
-0.00      |4          |Jakes Temps                        
-0.00      |28         |Musical Temping Agency             
-0.00      |11         |Musicians Temping Agency           
-0.00      |17         |Musicians Temping Agency           
-0.00      |33         |Pink Parrots Pet Shop              
-0.00      |23         |Smart Systems Software             
-0.00      |30         |Smart Systems Software             
-0.00      |12         |Smart Tegnologies                  
-0.00      |40         |Super Swings, Inc.                 
-0.00      |15         |Wilden Park                        
-0.01      |36         |High Street Architects             
-0.01      |8          |Musicians Temping Agency           
-0.02      |39         |Hot Shots Photography              
-0.12      |19         |Stevedores Galores                 
-0.65      |44         |                                   
-0.80      |10         |Carrs' Cars                        
-3.33      |9          |Dump Disk Systems                  
-12.00     |29         |Smart Systems Software             
-15.00     |42         |Musicians Temping Agency           
-30.20     |7          |                                   
-50.50     |2          |Diggs Diggings                     
-88.88     |37         |Far West Trading Co.               
-200.32    |1          |ABC Co                             
-225.00    |6          |Georgianas Shortcuts               
-768.74    |14         |Pink Parrots Pet Shop              
-800.80    |21         |Argonauts                          
-1800.00   |45         |Castle Air Structures              
-3009.28   |20         |Davids Diving                      
-5005.23   |3          |Divaddavid                         
-12003.27  |25         |Streetwise Driving School          
+BALANCE    |ACCOUNT    |COMPANY                            
+-----------------------------------------------------------
+0.00       |43         |                                   
+0.00       |38         |Beach Realtors                     
+0.00       |13         |Davids Diving                      
+0.00       |5          |Floris Flowers                     
+0.00       |35         |High Street Architects             
+0.00       |4          |Jakes Temps                        
+0.00       |28         |Musical Temping Agency             
+0.00       |11         |Musicians Temping Agency           
+0.00       |17         |Musicians Temping Agency           
+0.00       |33         |Pink Parrots Pet Shop              
+0.00       |23         |Smart Systems Software             
+0.00       |30         |Smart Systems Software             
+0.00       |12         |Smart Tegnologies                  
+0.00       |40         |Super Swings, Inc.                 
+0.00       |15         |Wilden Park                        
+0.01       |36         |High Street Architects             
+0.01       |8          |Musicians Temping Agency           
+0.02       |39         |Hot Shots Photography              
+0.12       |19         |Stevedores Galores                 
+0.65       |44         |                                   
+0.80       |10         |Carrs' Cars                        
+3.33       |9          |Dump Disk Systems                  
+12.00      |29         |Smart Systems Software             
+15.00      |42         |Musicians Temping Agency           
+30.20      |7          |                                   
+50.50      |2          |Diggs Diggings                     
+88.88      |37         |Far West Trading Co.               
+200.32     |1          |ABC Co                             
+225.00     |6          |Georgianas Shortcuts               
+768.74     |14         |Pink Parrots Pet Shop              
+800.80     |21         |Argonauts                          
+1800.00    |45         |Castle Air Structures              
+3009.28    |20         |Davids Diving                      
+5005.23    |3          |Divaddavid                         
+12003.27   |25         |Streetwise Driving School          
 ij> --- now check other input formats
 -- this is sample data with RecordSeperator=',', FieldStartDelimiter=(, FieldEndDelimiter=),FieldSeperator=TAB
 -- which the import can't handle (not the RecordSeparator, and there can be only one
@@ -303,7 +303,7 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT1' , 'extin/UnsupportedFormat1.dat' , 
                                       null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Invalid character string format for type INTEGER.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Invalid character string format for type INTEGER.' was thrown while evaluating an expression.
 ERROR 22018: Invalid character string format for type INTEGER.
 ij> select count(*) from Alt1;
 1          
@@ -325,7 +325,7 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT2' , 'extin/UnsupportedFormat2.dat' , 
                                       null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Column 'COLUMN10' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN10' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN10' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN10' is not a column in the target table.' was thrown while evaluating an expression.
 ERROR 42X04: Column 'COLUMN10' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN10' is not a column in the target table.
 ij> select count(*) from Alt2;
 1          
@@ -357,7 +357,7 @@
 0 rows inserted/updated/deleted
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT3' , 'extin/AccountData_NullFields.dat' , 
                                       null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Column 'COLUMN20' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN20' is not a column in the target table.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Column 'COLUMN20' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN20' is not a column in the target table.' was thrown while evaluating an expression.
 ERROR 42X04: Column 'COLUMN20' is either not in any table in the FROM list or appears within a join specification and is outside the scope of the join specification or appears in a HAVING clause and is not in the GROUP BY list. If this is a CREATE or ALTER TABLE  statement then 'COLUMN20' is not a column in the target table.
 ij> select count(*) from Alt3;
 1          
@@ -513,10 +513,10 @@
 ij> call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT7' ,
 			          'extin/AccountData_format2oops.dat' , 
 				  '|', '''', 'ASCII', 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Data found on line 1 for column 4 after the stop delimiter.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Data found on line 1 for column 4 after the stop delimiter.' was thrown while evaluating an expression.
 ERROR XIE03: Data found on line 1 for column 4 after the stop delimiter.  
 ij> select count(*) from Alt8;
-ERROR 42X05: Table/View 'ALT8' does not exist.
+ERROR 42X05: Table 'ALT8' does not exist.
 ij> rollback;
 ij> -- if there's no end of record (CR/LF) after 1st record, rest gets ignored
 drop table Alt8;
@@ -570,10 +570,10 @@
 				  null , '2,3,4,5,6,7,8,11,12', 
 				  'extin/Access1.txt' , 
 				  null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: The number of values assigned is not the same as the number of specified or implied columns.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: The number of values assigned is not the same as the number of specified or implied columns.' was thrown while evaluating an expression.
 ERROR 42802: The number of values assigned is not the same as the number of specified or implied columns.
 ij> select * from HouseHoldItem;
-ERROR 42X05: Table/View 'HOUSEHOLDITEM' does not exist.
+ERROR 42X05: Table 'HOUSEHOLDITEM' does not exist.
 ij> rollback;
 ij> -- import fails if datatype & format of data are not compatible
 create table HouseHoldItem(
@@ -592,10 +592,10 @@
 				  null , '2,3,4,5,6,7,8,11,12,10', 
 				  'extin/Access1.txt' , 
 				  null, null, null, 0) ;
-ERROR 38000: The exception 'java.sql.SQLException: Invalid character string format for type SMALLINT.' was thrown while evaluating an expression.
+ERROR 38000: The exception 'SQL Exception: Invalid character string format for type SMALLINT.' was thrown while evaluating an expression.
 ERROR 22018: Invalid character string format for type SMALLINT.
 ij> select * from HouseHoldItem;
-ERROR 42X05: Table/View 'HOUSEHOLDITEM' does not exist.
+ERROR 42X05: Table 'HOUSEHOLDITEM' does not exist.
 ij> rollback;
 ij> -- import will succeed with default format settings whether int, date, 
 -- or time fields have quotes in the import file or not
@@ -617,18 +617,18 @@
 				  null, null, null, 0) ;
 0 rows inserted/updated/deleted
 ij> select * from HouseHoldItem;
-CATEGORY   |ROOMID     |DESCRIPTION                                                                                                                     |MODEL                                             |MODELID                                           |SERIALNUMBER                                      |DAYPURCHA&|PURCHASEP&|INSURED   |NOTE                                                                                                                            
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-7          |3          |Exercise Bike                                                                                                                   |Deluxe                                            |KK200                                             |1234ABCDDDD1234                                   |1993-02-06|200.00    |100.00    |Clock Tower Sporting Goods                                                                                                      
-3          |1          |Gray three-cushion sofa                                                                                                         |70" sleeper                                       |NULL                                              |NULL                                              |1975-04-01|600.00    |NULL      |The Sofa Gallery                                                                                                                
-7          |6          |Mountain Bike                                                                                                                   |NULL                                              |NULL                                              |NULL                                              |1993-08-12|1239.00   |1000.00   |Crawford & Sons Custom Bicycles                                                                                                 
-6          |4          |Computer                                                                                                                        |375                                               |1089                                              |00001                                             |NULL      |3000.00   |2500.00   |ByteComp, Inc.                                                                                                                  
-5          |6          |Cordless drill                                                                                                                  |Deluxe                                            |PK200                                             |XXX8373220                                        |1993-08-18|2000.00   |1250.00   |Costoso, Ltd.                                                                                                                   
-3          |5          |Ebony inlaid table                                                                                                              |NULL                                              |NULL                                              |NULL                                              |1990-04-01|250.00    |NULL      |NULL                                                                                                                            
-5          |6          |Table saw                                                                                                                       |NULL                                              |BKV100                                            |BKV9832355                                        |NULL      |NULL      |110.00    |NULL                                                                                                                            
-2          |4          |Baseball card collection                                                                                                        |NULL                                              |NULL                                              |NULL                                              |NULL      |NULL      |500.00    |NULL                                                                                                                            
-4          |3          |Pearl neclace                                                                                                                   |NULL                                              |NULL                                              |NULL                                              |1990-05-01|NULL      |250.00    |NULL                                                                                                                            
-6          |1          |Audio-Visual Receiver                                                                                                           |NULL                                              |AV-520                                            |AVZZZ98333257                                     |1994-10-10|800.00    |NULL      |Southridge Video Shop                                                                                                           
+CATEGORY   |ROOMID     |DESCRIPTION                                                                                                                     |MODEL                                             |MODELID                                           |SERIALNUMBER                                      |DAYPURCHA&|PURCHASEPR&|INSURED    |NOTE                                                                                                                            
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+7          |3          |Exercise Bike                                                                                                                   |Deluxe                                            |KK200                                             |1234ABCDDDD1234                                   |1993-02-06|200.00     |100.00     |Clock Tower Sporting Goods                                                                                                      
+3          |1          |Gray three-cushion sofa                                                                                                         |70" sleeper                                       |NULL                                              |NULL                                              |1975-04-01|600.00     |NULL       |The Sofa Gallery                                                                                                                
+7          |6          |Mountain Bike                                                                                                                   |NULL                                              |NULL                                              |NULL                                              |1993-08-12|1239.00    |1000.00    |Crawford & Sons Custom Bicycles                                                                                                 
+6          |4          |Computer                                                                                                                        |375                                               |1089                                              |00001                                             |NULL      |3000.00    |2500.00    |ByteComp, Inc.                                                                                                                  
+5          |6          |Cordless drill                                                                                                                  |Deluxe                                            |PK200                                             |XXX8373220                                        |1993-08-18|2000.00    |1250.00    |Costoso, Ltd.                                                                                                                   
+3          |5          |Ebony inlaid table                                                                                                              |NULL                                              |NULL                                              |NULL                                              |1990-04-01|250.00     |NULL       |NULL                                                                                                                            
+5          |6          |Table saw                                                                                                                       |NULL                                              |BKV100                                            |BKV9832355                                        |NULL      |NULL       |110.00     |NULL                                                                                                                            
+2          |4          |Baseball card collection                                                                                                        |NULL                                              |NULL                                              |NULL                                              |NULL      |NULL       |500.00     |NULL                                                                                                                            
+4          |3          |Pearl neclace                                                                                                                   |NULL                                              |NULL                                              |NULL                                              |1990-05-01|NULL       |250.00     |NULL                                                                                                                            
+6          |1          |Audio-Visual Receiver                                                                                                           |NULL                                              |AV-520                                            |AVZZZ98333257                                     |1994-10-10|800.00     |NULL       |Southridge Video Shop                                                                                                           
 ij> rollback;
 ij> ----
 ---- test export 

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/master/importExportIJ.out
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall?rev=691859&r1=691858&r2=691859&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall Wed Sep  3 20:19:14 2008
@@ -1,6 +1,6 @@
 tools/dblook_test.java
 tools/importExport.java
-tools/importExportThruIJ.sql
+tools/importExportIJ.sql
 tools/ieptests.sql
 tools/iepnegativetests.sql
 tools/ij.sql

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=691859&r1=691858&r2=691859&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml Wed Sep  3 20:19:14 2008
@@ -29,7 +29,7 @@
     </copy>
     <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ImportExport">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ImportExport"
-        includes="*.asc,*.del,*.txt,*.utf"/>
+        includes="*.asc,*.del,*.txt,*.utf,*.dat"/>
     </copy>
   </target>
 

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/copyfiles.ant
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/copyfiles.ant?rev=691859&r1=691858&r2=691859&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/copyfiles.ant (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/copyfiles.ant Wed Sep  3 20:19:14 2008
@@ -9,8 +9,8 @@
 iepnegativetests_app.properties
 ieptests.sql
 ieptests_app.properties
-importExportThruIJ.sql
-importExportThruIJ_app.properties
+importExportIJ.sql
+importExportIJ_app.properties
 importExport_app.properties
 importExport_sed.properties
 ij.sql

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport.java?rev=691859&r1=691858&r2=691859&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport.java (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport.java Wed Sep  3 20:19:14 2008
@@ -148,7 +148,7 @@
 			//test less data case on the seconds line of input that 
 			//should throw end of file exception. 
 			try{
-				doImportFromFile("extin/EndOfFile.txt" , "T4" , null , null , null, 0);
+				doImportFromFile("extin/TwoLineBadEOF.dat" , "T4" , null , null , null, 0);
 			}catch (Exception ex) {
 				printExceptionMessage(ex);
 			}
@@ -352,10 +352,13 @@
 			verifyCount(
 						stmt.executeUpdate("CREATE TABLE T3 (C1 BLOB)"), 0);
 			verifyCount(
-						stmt.executeUpdate("create table T4 (   Account int,    Fname   char(30),"+
-                        "Lname   char(30), Company varchar(35), Address varchar(40), City    varchar(20),"+
- 					   "State   char(5), Zip     char(10), Payment decimal(8,2), Balance decimal(8,2))"),0);
-			
+
+						stmt.executeUpdate("create table T4 (   Account int,  Name   char(30), Jobdesc char(40), " +
+										   "Company varchar(35), Address1 varchar(40), Address2 varchar(40), " +
+										   "City    varchar(20), State   char(5), Zip char(10), Country char(10), " +
+										   "Phone1  char(20), Phone2  char(20), email   char(30), web     char(30), " +
+										   "Fname   char(30), Lname   char(30), Comment char(30), AccDate char(30), " +
+										   "Payment decimal(8,2), Balance decimal(8,2))"),0);
 		} else {
 			verifyBoolean( stmt.execute("DELETE FROM t1"), false);
 		}

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties?rev=691859&r1=691858&r2=691859&view=diff
==============================================================================
--- db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties (original)
+++ db/derby/code/branches/10.1/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExport_app.properties Wed Sep  3 20:19:14 2008
@@ -1,3 +1,3 @@
-supportfiles=testData/ImportExport/EndOfFile.txt
+supportfiles=testData/ImportExport/TwoLineBadEOF.dat
 usedefaults=true
 useextdirs=true
\ No newline at end of file



Mime
View raw message