db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r691506 [3/3] - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ suites/ testData/ testData/ImportExport/ tests/tools/
Date Wed, 03 Sep 2008 03:51:50 GMT
Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_NullFields.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,3 @@
+"6","Georgiana George","Groomer","Georgianas Shortcuts","","Boulder","CO","80303","","303.303.3303","(303)-333-3333","georgeor@cuts.com","","Georgiana
","George","Customer","2005-05-31","50.25","225.00"
+"7","Jim  James","","","","","","","","","(222)-222-2222","","jim@nowhere.com","","Jim ","James","Gone","2001-01-01","60.20","30.20"
+"8","Richard Lionlong","Singer","Musicians Temping Agency","","","New York ","NY","","","212/212-2112","","lionlong@long.org","","Richard","LionLong","Loud","1999-09-09","5012.03","0.01"

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_defaultformat.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,35 @@
+"1","Abby Abbott","","ABC Co","1 Alphabet Road","","Achorage","AK","111-1111","","(111)-111-1111","","abbyabbott@no.such.com","","Abby
","Abbott","Oldest Customer","1900-01-01","0.0","200.32"
+"2","Don Diggs","Project Manager","Diggs Diggings","","","","","","","(112)-111-1112","","dd@ddiggings.com","","Don","Diggs","Down
the Drain","1990-01-01","0.50","50.50"
+"3","David  Divad","","Divaddavid","","","","","","","(111)-112-1113","","dadi@dida","","David","Divad","Customer","1999-01-01","6.23","5005.23"
+"4","Manuela Man","Manual Laborer","Jakes Temps","New Jersey Turnpike","","New Jersey","NJ","12345","","555/555-5555
x555","555/555-5554","manny@jakestemp.com","","Manfred ","Man","Workerbee","2008-03-15","3.30","0.00"
+"5","Floris Fluks","Floral Arranger","Floris Flowers","22 North South West Road","","Largo","FL","33773","","813/813-8113","813/813-1881","","","Floris
","Fluks","Richest Customer","1999-09-09","612.22","0.00"
+"6","Georgiana George","Groomer","Georgianas Shortcuts","1 Gorgeous Gorge Lane, Suite 1","","Boulder","CO","80303","","303.303.3303","(303)-333-3333","georgeor@cuts.com","","Georgiana
","George","Customer","2005-05-31","50.25","225.00"
+"7","Jim  James","","","","","","","","","(222)-222-2222","","jim@nowhere.com","","Jim ","James","Gone","2001-01-01","60.20","30.20"
+"8","Richard Lionlong","Singer","Musicians Temping Agency","","","New York ","NY","","","212/212-2112","","lionlong@long.org","","Richard","LionLong","Loud","1999-09-09","5012.03","0.01"
+"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"
+"10","Carina Catharina Carr","","Carrs' Cars","","","Dallas","TX","","","972/972-9720","","cc@mailprovider.com","www.caricature.com","Carina
","Carr","Customer","2007-01-01","602.99","0.80"
+"11","Anton  Bismal","V.P. Sales","Musicians Temping Agency","","","New York","NY","10006","","212/211-2112","","","","Anton
","Bismal","Customer","2006-06-12","50.20","0.00"
+"12","Fanny  Fay","","Smart Tegnologies","10 Extra Broad Way","","New York","NY","10004","","212/111-2222","212/111-2221","fanfy@smartteg.com","http://www.smartteg.com/","Fanny
","Fay","Funny","2000-01-01","0.00","0.00"
+"13","David Doo","VP Marketing","Davids Diving","3 Third Street, Suite 333","","Burlington","MA","01803","","781/777-8811","781/777-8881","","","David","Doo","In
Deep","2008-03-01","0.00","0.00"
+"14","Loret  Ta","V.P. Sales","Pink Parrots Pet Shop","1 Green Tree Lane","","Houston","TX","77046","","713/888-8888","713/888-8887","loretta@ppp.com","","Loret","Ta","Flown","2002-02-01","384.37","768.74"
+"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"
+"17","Michael  Leachim","Software Developer","Musicians Temping Agency","5 Rocky Road","","Rochester","NY","14614","","716
555 5571","716.555.5716","mile@long.org","","Michael ","Leachim","lala","2008-08-08","65.65","0.00"
+"19","Steven  Stevedore","Stevedore","Stevedores Galores","","","Provo","UT","","USA","801
780 1081","","steve@dore.com","","Steven ","Stevedore","Stoven","1998-01-01","30.74","0.12"
+"20","Zebedeus  Amadeus","","Davids Diving","3 Third Street, Suite 333","","Burlington","MA","01803","","","","ze.am@nowhere.com","","Zebedeus
","Amadeus","Doven","2008-02-01","300.00","3009.28"
+"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"
+"23","Jesus  Lopez","CEO","Smart Systems Software","","","","","","","111/222-1111","","jelo@sss.com","","Jesus
","Lopez","Customer","2007-01-01","0.00","0.00"
+"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"
+"29","Marina Baikalskayova","","Smart Systems Software","","","","","","","(222) 222-2222","","","","Marina
","Baikalskayova","Customer","2008-01-01","0.00","12.00"
+"30","Connie Ecticut","V.P. Human Resources","Smart Systems Software","1 Main Street","","Hartford","CT","11111-2222","","203
203 2203","","con@sss.com","","Connie","Ecticut","Customer","2008-11-11","30.23","0.00"
+"33","Sil  Trouble","V.P. Human Resources","Pink Parrots Pet Shop","1 Green Tree Lane","","Houston","TX","78787","","512
512 5122","512.512.5123","sil.trouble@ppp.com","","Silvia ","Trouble","Customer","2002-02-02","0.00","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","00.03","0.02"
+"40","Jacques Balonceoir ","Engineer","Super Swings, Inc.","","","Jackson Hole","UT","84555","USA","888-777-6666","888-777-6667","jacquesb@sswings.com","http://www.sswings.com","Jacques
","Balancoir","In Full Swing","2008-02-02","91.23","0.00"
+"42","Ulrike Bach","Violinist","Musicians Temping Agency","23 KaisersAllee","","Vienna","","","Austria","+43
1 000001","+43 000010","ubach@mtempo.com","","Ulrike","Back","Fiddling","2008-01-01","87.92","15.00"
+"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"

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format1.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1 @@
+"1"q"Abby Abbott"q""q"ABC Co"q"1 Alphabet Road"q""q"Achorage"q"AK"q"111-1111"q""q"(111)-111-1111"q""q"abbyabbott@no.such.com"q""q"Abby
"q"Abbott"q"Oldest Customer"q"1900-01-01"q"0.0"q"200.32"

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,35 @@
+'1'|'Abby Abbott'|''|'ABC Co'|'1 Alphabet Road'|''|'Achorage'|'AK'|'111-1111'|''|'(111)-111-1111'|''|'abbyabbott@no.such.com'|''|'Abby
'|'Abbott'|'Oldest Customer'|'1900-01-01'|'0.0'|'200.32'
+'2'|'Don Diggs'|'Project Manager'|'Diggs Diggings'|''|''|''|''|''|''|'(112)-111-1112'|''|'dd@ddiggings.com'|''|'Don'|'Diggs'|'Down
the Drain'|'1990-01-01'|'0.50'|'50.50'
+'3'|'David  Divad'|''|'Divaddavid'|''|''|''|''|''|''|'(111)-112-1113'|''|'dadi@dida'|''|'David'|'Divad'|'Customer'|'1999-01-01'|'6.23'|'5005.23'
+'4'|'Manuela Man'|'Manual Laborer'|'Jakes Temps'|'New Jersey Turnpike'|''|'New Jersey'|'NJ'|'12345'|''|'555/555-5555
x555'|'555/555-5554'|'manny@jakestemp.com'|''|'Manfred '|'Man'|'Workerbee'|'2008-03-15'|'3.30'|'0.00'
+'5'|'Floris Fluks'|'Floral Arranger'|'Floris Flowers'|'22 North South West Road'|''|'Largo'|'FL'|'33773'|''|'813/813-8113'|'813/813-1881'|''|''|'Floris
'|'Fluks'|'Richest Customer'|'1999-09-09'|'612.22'|'0.00'
+'6'|'Georgiana George'|'Groomer'|'Georgianas Shortcuts'|'1 Gorgeous Gorge Lane| Suite 1'|''|'Boulder'|'CO'|'80303'|''|'303.303.3303'|'(303)-333-3333'|'georgeor@cuts.com'|''|'Georgiana
'|'George'|'Customer'|'2005-05-31'|'50.25'|'225.00'
+'7'|'Jim  James'|''|''|''|''|''|''|''|''|'(222)-222-2222'|''|'jim@nowhere.com'|''|'Jim '|'James'|'Gone'|'2001-01-01'|'60.20'|'30.20'
+'8'|'Richard Lionlong'|'Singer'|'Musicians Temping Agency'|''|''|'New York '|'NY'|''|''|'212/212-2112'|''|'lionlong@long.org'|''|'Richard'|'LionLong'|'Loud'|'1999-09-09'|'5012.03'|'0.01'
+'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'
+'10'|'Carina Catharina Carr'|''|'Carrs Cars'|''|''|'Dallas'|'TX'|''|''|'972/972-9720'|''|'cc@mailprovider.com'|'www.caricature.com'|'Carina
'|'Carr'|'Customer'|'2007-01-01'|'602.99'|'0.80'
+'11'|'Anton  Bismal'|'V.P. Sales'|'Musicians Temping Agency'|''|''|'New York'|'NY'|'10006'|''|'212/211-2112'|''|''|''|'Anton
'|'Bismal'|'Customer'|'2006-06-12'|'50.20'|'0.00'
+'12'|'Fanny  Fay'|''|'Smart Tegnologies'|'10 Extra Broad Way'|''|'New York'|'NY'|'10004'|''|'212/111-2222'|'212/111-2221'|'fanfy@smartteg.com'|'http://www.smartteg.com/'|'Fanny
'|'Fay'|'Funny'|'2000-01-01'|'0.00'|'0.00'
+'13'|'David Doo'|'VP Marketing'|'Davids Diving'|'3 Third Street| Suite 333'|''|'Burlington'|'MA'|'01803'|''|'781/777-8811'|'781/777-8881'|''|''|'David'|'Doo'|'In
Deep'|'2008-03-01'|'0.00'|'0.00'
+'14'|'Loret  Ta'|'V.P. Sales'|'Pink Parrots Pet Shop'|'1 Green Tree Lane'|''|'Houston'|'TX'|'77046'|''|'713/888-8888'|'713/888-8887'|'loretta@ppp.com'|''|'Loret'|'Ta'|'Flown'|'2002-02-01'|'384.37'|'768.74'
+'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'
+'17'|'Michael  Leachim'|'Software Developer'|'Musicians Temping Agency'|'5 Rocky Road'|''|'Rochester'|'NY'|'14614'|''|'716
555 5571'|'716.555.5716'|'mile@long.org'|''|'Michael '|'Leachim'|'lala'|'2008-08-08'|'65.65'|'0.00'
+'19'|'Steven  Stevedore'|'Stevedore'|'Stevedores Galores'|''|''|'Provo'|'UT'|''|'USA'|'801
780 1081'|''|'steve@dore.com'|''|'Steven '|'Stevedore'|'Stoven'|'1998-01-01'|'30.74'|'0.12'
+'20'|'Zebedeus  Amadeus'|''|'Davids Diving'|'3 Third Street| Suite 333'|''|'Burlington'|'MA'|'01803'|''|''|''|'ze.am@nowhere.com'|''|'Zebedeus
'|'Amadeus'|'Doven'|'2008-02-01'|'300.00'|'3009.28'
+'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'
+'23'|'Jesus  Lopez'|'CEO'|'Smart Systems Software'|''|''|''|''|''|''|'111/222-1111'|''|'jelo@sss.com'|''|'Jesus
'|'Lopez'|'Customer'|'2007-01-01'|'0.00'|'0.00'
+'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'
+'29'|'Marina Baikalskayova'|''|'Smart Systems Software'|''|''|''|''|''|''|'(222) 222-2222'|''|''|''|'Marina
'|'Baikalskayova'|'Customer'|'2008-01-01'|'0.00'|'12.00'
+'30'|'Connie Ecticut'|'V.P. Human Resources'|'Smart Systems Software'|'1 Main Street'|''|'Hartford'|'CT'|'11111-2222'|''|'203
203 2203'|''|'con@sss.com'|''|'Connie'|'Ecticut'|'Customer'|'2008-11-11'|'30.23'|'0.00'
+'33'|'Sil  Trouble'|'V.P. Human Resources'|'Pink Parrots Pet Shop'|'1 Green Tree Lane'|''|'Houston'|'TX'|'78787'|''|'512
512 5122'|'512.512.5123'|'sil.trouble@ppp.com'|''|'Silvia '|'Trouble'|'Customer'|'2002-02-02'|'0.00'|'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'|'00.03'|'0.02'
+'40'|'Jacques Balonceoir '|'Engineer'|'Super Swings| Inc.'|''|''|'Jackson Hole'|'UT'|'84555'|'USA'|'888-777-6666'|'888-777-6667'|'jacquesb@sswings.com'|'http://www.sswings.com'|'Jacques
'|'Balancoir'|'In Full Swing'|'2008-02-02'|'91.23'|'0.00'
+'42'|'Ulrike Bach'|'Violinist'|'Musicians Temping Agency'|'23 KaisersAllee'|''|'Vienna'|''|''|'Austria'|'+43
1 000001'|'+43 000010'|'ubach@mtempo.com'|''|'Ulrike'|'Back'|'Fiddling'|'2008-01-01'|'87.92'|'15.00'
+'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'

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/AccountData_format2oops.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,2 @@
+'10'|'Carina Catharina Carr'|''|'Carrs' Cars'|''|''|'Dallas'|'TX'|''|''|'972/972-9720'|''|'cc@mailprovider.com'|'www.caricature.com'|'Carina
'|'Carr'|'Customer'|'2007-01-01'|'602.99'|'0.80'
+'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'

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/NoEOR.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1 @@
+"51","Linda Lindemans","Sommelier","No Vine Wine","8 Long Lindenlane","","LindenForest","WA","33443","","232-323-1111","","lindalinde@no.such.com","","Linda
","Lindemans","Customer","2008-02-29","0.0","200.32","52","Susan Nah","Manager Acquisitions","Huge
Corporation, Corp.","","","","","","","211-112-1112","","susanna@hugecorp.com","","Susan","Nah","Nah!","2004-04-30","0.50","50.50"

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/TwoLineBadEOF.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,2 @@
+"1","Abby Abbott","","ABC Co","1 Alphabet Road","","Achorage","AK","111-1111","","(111)-111-1111","","abbyabbott@no.such.com","","Abby
","Abbott","Oldest Customer","1900-01-01","0.0","200.32"
+"2","Don Daniel","Project Manager","Daniels Diggings"

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat1.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1 @@
+(51)	(Linda Lindemans)	(Sommelier)	 (No Vine Wine)	 (8 Long Lindenlane)	 (LindenForest)	(WA)
(33443)	(0.0)	(200.32),(52)	(Susan Nah)	(Manager Acquisitions)	(Huge Corporation, Corp.)	()
()	()	()	(0.50)	(50.50),(53)	(Sherry Ampoo)	(Hair Stylist)	(Shorter Hair Cuts)	(1 Old Volcano
Road)	(Volcano)	(HI)	(96785)	(0.00)	(201.00),(54)	(Torrence Tempest)	(Tour Guide)	(Twister
Chase Tours)	(5 Tornado Ally)	()	(OK)	(22222)	(2222.22)	(0.02),(55)	(Tia Tante)	(Tea Room
Operator)	(Tias Teas)	(5 Lincoln Ave)	(Lincoln)	(CA)	(33333)	(5.00)	(0.00),(56)	(Mary Popping)
(Day Care Provider)	(The Secret Closet)	(10 Childrens Close)	(Lindon)	(GB)	(75UK5)	(0.02)
(0.00),(57)	(Bob Muffin)	(Baker)	(Muffins Muffins)	(1 Drury Lane)	(Druryvale)	(GB)	(1UK1GB)
(77.70)	(2098.71),(58)	(Jimminy Crickets)	(Sports Coach)	(Centraal SportCentrum)	(5 Cricket
Field Lane)	(Antwerp)	(B)	(1234)	(16.04)	(0.00),

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/ImportExport/UnsupportedFormat2.dat
Tue Sep  2 20:51:49 2008
@@ -0,0 +1 @@
+(52)	(Susan Nah)	(Manager Acquisitions)	(Huge Corporation, Corp.)	()	()	()	()	(0.50)	(50.50),(53)
(Sherry Ampoo)	(Hair Stylist)	(Shorter Hair Cuts)	(1 Old Volcano Road)	(Volcano)	(HI)	(96785)
(0.00)	(201.00),(54)	(Torrence Tempest)	(Tour Guide)	(Twister Chase Tours)	(5 Tornado Ally)
()	(OK)	(22222)	(2222.22)	(0.02),(55)	(Tia Tante)	(Tea Room Operator)	(Tias Teas)	(5 Lincoln
Ave)	(Lincoln)	(CA)	(33333)	(5.00)	(0.00),(56)	(Mary Popping)	(Day Care Provider)	(The Secret
Closet)	(10 Childrens Close)	(Lindon)	(GB)	(75UK5)	(0.02)	(0.00),(57)	(Bob Muffin)	(Baker)
(Muffins Muffins)	(1 Drury Lane)	(Druryvale)	(GB)	(1UK1GB)	(77.70)	(2098.71),(58)	(Jimminy
Crickets)	(Sports Coach)	(Centraal SportCentrum)	(5 Cricket Field Lane)	(Antwerp)	(B)	(1234)
(16.04)	(0.00),

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

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml?rev=691506&r1=691505&r2=691506&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/testData/build.xml
Tue Sep  2 20:51:49 2008
@@ -45,7 +45,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>
     <copy todir="${out.dir}/${derby.testing.functest.dir}/testData/ResultSetStream">
       <fileset dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/testData/ResultSetStream"

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java?rev=691506&r1=691505&r2=691506&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ImportExportTest.java
Tue Sep  2 20:51:49 2008
@@ -64,7 +64,7 @@
 	
 	public static Test baseSuite(String name) {
 		TestSuite suite = new TestSuite(ImportExportTest.class, name);
-		Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ImportExport/EndOfFile.txt"}
);
+		Test test = new SupportFilesSetup(suite, new String[] {"functionTests/testData/ImportExport/TwoLineBadEOF.dat"}
);
 		return new CleanDatabaseTestSetup(test) {
             protected void decorateSQL(Statement s) throws SQLException {
 
@@ -78,11 +78,13 @@
 						   "COLUMN7 DOUBLE PRECISION , COLUMN8 INT , COLUMN9 BIGINT , COLUMN10 NUMERIC , "
+
 						   "COLUMN11 REAL , COLUMN12 SMALLINT , COLUMN13 TIME , COLUMN14 TIMESTAMP , "+
 						   "COLUMN15 SMALLINT , COLUMN16 VARCHAR(1))");
-                s.execute("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))");
-                
-            }
+                s.execute("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))");
+                }
         };
 	}
 	
@@ -165,7 +167,7 @@
 	public void testEarlyEndOfFile() throws Exception {
 		Connection c = getConnection();
 		try {
-			doImportFromFile(c, "extin/EndOfFile.txt" , "T4" , null , null , "US-ASCII", 0);
+			doImportFromFile(c, "extin/TwoLineBadEOF.dat" , "T4" , null , null , "US-ASCII", 0);
             fail();
 		} catch (SQLException e) {
 			assertSQLState("XIE0E", e);

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ.sql
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,560 @@
+--
+--   Licensed to the Apache Software Foundation (ASF) under one or more
+--   contributor license agreements.  See the NOTICE file distributed with
+--   this work for additional information regarding copyright ownership.
+--   The ASF licenses this file to You under the Apache License, Version 2.0
+--   (the "License"); you may not use this file except in compliance with
+--   the License.  You may obtain a copy of the License at
+--
+--      http://www.apache.org/licenses/LICENSE-2.0
+--
+--   Unless required by applicable law or agreed to in writing, software
+--   distributed under the License is distributed on an "AS IS" BASIS,
+--   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+--   See the License for the specific language governing permissions and
+--   limitations under the License.
+--
+-- test for import export thru command line interface
+
+-- first test basic import functionality
+-- ascii delimited default format
+drop table T1;
+create table T1 (	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));
+
+create index T1_IndexBalance on T1 (Balance, Account, Company);
+create index T1_IndexFname on T1 (Fname, Account);
+create index T1_IndexLname on T1 (Lname, Account);
+
+-- 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) ;
+
+-- should work, default format (i.e. field sep , column delimiter ".)
+-- (last two lines have extra white space (tabs, spaces) which should not matter).
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T1' , 'extin/AccountData_defaultformat.dat' ,

+                                    null, null, null, 0) ;
+
+values (SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'T1'));
+
+-- Delimited with a different char but using default import format
+drop table T2;
+
+autocommit off;
+create table T2 (	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));
+
+create index T2_IndexBalance on T2 (Balance, Account, Company);
+create index T2_IndexFname on T2 (Fname, Account);
+create index T2_IndexLname on T2 (Lname, Account);
+commit;
+--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) ;
+
+values (SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'T2'));
+-- so following should only commit an empty table
+commit;
+
+-- But if we use correct specification?
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'T2' , 'extin/AccountData_format1.dat' , 
+				   'q', '"', 'ASCII', 0) ;
+
+values (SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'T2'));
+select count(*) from T2;
+rollback;
+
+-- test remapping
+drop table T3;
+create table T3 (	Lname	char(30),
+			Fname	char(30),
+			Account	int not null primary key,
+			Company varchar(35),
+			Payment	decimal(8,2),
+			Balance decimal(8,2));
+
+create index T3_indexBalance on T3 (Balance, Company, Account);
+create index T3_indexPayment on T3 (Payment, Company, Account);
+
+--incorrect mapping of file to table ; should give error and rollback
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T3' , 
+                                  null , '16, 15, 1, 4, 19, 200' ,
+				  'extin/AccountData_defaultformat.dat' , 
+				  null, null, null, 0) ;
+select count(*) from T3;
+
+drop table T4;
+create table T4 (	Lname	char(30),
+			Fname	char(30),
+			Account	int not null primary key,
+			Company varchar(35),
+			Payment	decimal(8,2),
+			Balance decimal(8,2));
+
+create index T4_indexBalance on T4 (Balance, Company, Account);
+create index T4_indexPayment on T4 (Payment, Company, Account);
+-- correctly remapped
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'T4' ,  
+                                  null , '16, 15, 1, 4, 19, 20' ,
+				  'extin/AccountData_defaultformat.dat' ,
+				   null, null, null, 0) ;
+values (SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'T4'));
+commit;
+
+-- now check results
+select count(*) from T1;
+select count(*) from T2;
+select count(*) from T3;
+select count(*) from T4;
+
+select * from T1 where State = 'CA';
+select * from T2 where State = 'CA';
+select * from T4 where Fname = 'Georgiana' or Fname = 'Michael';
+
+select Balance, Account, Company from T1 order by Balance;
+select Balance, Account, Company from T2 order by Balance;
+select Balance, Account, Company from T4 order by Balance;
+
+--- 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
+-- fieldDelimitor character). 
+-- The error XIE0R and 22018 are returned if the 1 line file is largish  
+autocommit on;
+drop table Alt1;
+create table Alt1 (	Account	int,
+			Name    char(30),
+			Jobdesc char(40),
+			Company varchar(35),
+			Address1 varchar(40),
+			City	varchar(20),
+			State	char(5),
+			Zip	char(10),
+			Payment	decimal(8,2),
+			Balance decimal(8,2));
+
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT1' , 'extin/UnsupportedFormat1.dat' , 
+                                      null, null, null, 0) ;
+
+select count(*) from Alt1;
+
+-- But error 38000 and 42X04 are returned if the 1 line file is smaller  
+drop table Alt2;
+create table Alt2 (	Account	int,
+			Name    char(30),
+			Jobdesc char(40),
+			Company varchar(35),
+			Address1 varchar(40),
+			City	varchar(20),
+			State	char(5),
+			Zip	char(10),
+			Payment	decimal(8,2),
+			Balance decimal(8,2));
+
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT2' , 'extin/UnsupportedFormat2.dat' , 
+                                      null, null, null, 0) ;
+
+select count(*) from Alt2;
+
+-- this is sample data with some null (missing) fields
+
+drop table Alt3;
+create table Alt3 (	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));
+
+
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT3' , 'extin/AccountData_NullFields.dat' , 
+                                      null, null, null, 0) ;
+
+select count(*) from Alt3;
+
+--test more remapping - size matters not
+create table Alt4(column1 varchar(1000) , column3 varchar(1000) , column9 varchar(1000));
+
+call SYSCS_UTIL.SYSCS_IMPORT_DATA (null, 'ALT4' , 
+   				   null , '2,3,9',
+				   'extin/AccountData_defaultformat.dat' , 
+				   null, null, null, 0) ;
+select * from Alt4;
+
+--- Format with | as column separator and '' as delimiter. Also remapping
+drop table Alt5;
+create table Alt5 (
+	Id	int,
+	Name	varchar(40),
+	Title	varchar(40),
+	Company	varchar(50),
+	Address	varchar(80),
+	City	varchar(30),
+	State	varchar(30),
+	Zip	varchar(30),
+	Country varchar(30),
+	phone1	varchar(50),
+	phone2	varchar(30),
+	email	varchar(80),
+	web	varchar(50));
+
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'ALT5' ,
+                                  null , '1,2,3,4,5,7,8,9,10,11,12,13,14', 
+	 		          'extin/AccountData_format2.dat' , 
+				  '|', '''', 'ASCII', 0) ;
+
+	
+select Company, Country from Alt5 where country not like 'U%S%A%' and country is not null;
+
+rollback;
+
+-- test remapping out of sequence
+drop table Alt6;
+create table Alt6 (
+	Fname varchar(30),
+	Lname varchar(30),
+	email varchar(40),
+	phone varchar(30));
+
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'ALT6' , 
+		                  null , '15, 16, 13, 11',
+			          'extin/AccountData_format2.dat' , 
+				  '|', '''', 'ASCII', 0) ;
+select count(*) from Alt6;
+
+rollback;
+
+-- import fails if data has delimiter character within field. 
+drop table Alt7;
+create table Alt7 (	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));
+
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT7' ,
+			          'extin/AccountData_format2oops.dat' , 
+				  '|', '''', 'ASCII', 0) ;
+
+select count(*) from Alt8;
+rollback;
+
+-- if there's no end of record (CR/LF) after 1st record, rest gets ignored
+drop table Alt8;
+create table Alt8 (	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));
+
+call SYSCS_UTIL.SYSCS_IMPORT_TABLE (null, 'ALT8' , 'extin/NoEOR.dat' , 
+                                      null, null, null, 0) ;
+
+select count(*) from Alt8;
+rollback;
+
+autocommit off;
+
+-- import fails if the table has more columns than named in import statement
+drop table HouseHoldItem;
+create table HouseHoldItem(
+	Category	int,
+	RoomId		int,
+	Description	varchar(255),
+	Model		varchar(50),
+	ModelId		varchar(50),
+	SerialNumber	varchar(50),
+	DayPurchase	date,
+	PurchasePrice	decimal(8,2),
+	Insured		decimal(8,2),
+	Note		varchar(512));
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'HOUSEHOLDITEM' , 
+				  null , '2,3,4,5,6,7,8,11,12', 
+				  'extin/Access1.txt' , 
+				  null, null, null, 0) ;
+select * from HouseHoldItem;
+rollback;
+
+-- import fails if datatype & format of data are not compatible
+create table HouseHoldItem(
+	Category	int,
+	RoomId		int,
+	Description	varchar(255),
+	Model		varchar(50),
+	ModelId		varchar(50),
+	SerialNumber	varchar(50),
+	DayPurchase	date,
+	PurchasePrice	decimal(8,2),
+	Insured		smallint,
+	Note		varchar(512));
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'HOUSEHOLDITEM' , 
+				  null , '2,3,4,5,6,7,8,11,12,10', 
+				  'extin/Access1.txt' , 
+				  null, null, null, 0) ;
+select * from HouseHoldItem;
+rollback;
+
+-- import will succeed with default format settings whether int, date, 
+-- or time fields have quotes in the import file or not
+create table HouseHoldItem(
+	Category	int,
+	RoomId		int,
+	Description	varchar(255),
+	Model		varchar(50),
+	ModelId		varchar(50),
+	SerialNumber	varchar(50),
+	DayPurchase	date,
+	PurchasePrice	decimal(8,2),
+	Insured		decimal(8,2),
+	Note		varchar(512));
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'HOUSEHOLDITEM' , 
+				  null , '2,3,4,5,6,7,8,11,12,10', 
+				  'extin/Access1.txt' , 
+				  null, null, null, 0) ;
+select * from HouseHoldItem;
+rollback;
+
+
+----
+---- test export 
+----
+
+call SYSCS_UTIL.SYSCS_EXPORT_TABLE (null, 'T1' , 'extinout/t1.dump' , 
+                                    '|','''', 'ASCII') ;
+
+create table  imp_temp(column2 varchar(200), 
+                  column3 varchar(200), 
+                  column4 varchar(200), 
+                  column5 varchar(200),
+                  column6 varchar(200));
+
+call SYSCS_UTIL.SYSCS_IMPORT_DATA(null, 'IMP_TEMP' ,null, '2, 3, 4, 5, 6',
+                                    'extinout/t1.dump', '|', '''', 'ASCII', 0) ;
+
+select * from imp_temp ;
+drop table imp_temp;
+
+-- test case for derby-1854/derby-1641
+-- perform import into a table that has same column 
+-- as a primary key and a foreign key (ADMINS table).  
+
+create table users (
+ user_id int not null generated by default as identity,
+ user_login varchar(255) not null,
+ primary key (user_id));
+
+create table admins (
+ user_id int not null,
+ primary key (user_id),
+ constraint admin_uid_fk foreign key (user_id) references users (user_id));
+ 
+insert into users (user_login) values('test1');
+insert into users (user_login) values('test2');
+
+call SYSCS_UTIL.SYSCS_EXPORT_QUERY('select user_id from users' , 
+                    'extinout/users_id.dat', null , null , null ) ;
+call syscs_util.syscs_import_table( null, 'ADMINS', 
+                    'extinout/users_id.dat', null, null, null,1); 
+select * from admins; 
+select * from users;
+-- do consistency check on the table.
+values SYSCS_UTIL.SYSCS_CHECK_TABLE('APP', 'ADMINS');
+drop table admins;
+drop table users;
+-- end derby-1854/derby-1641 test case. 
+
+--
+-- begin test case for derby-2193:
+--
+-- Field comprised of all blank space should become a null
+--
+
+create table derby_2193_tab
+(
+    a  varchar( 50 ),
+    b  varchar( 50 )
+);
+
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE 
+( null, 'DERBY_2193_TAB', 'extin/derby-2193.txt', null, null, null, 0 );
+select * from derby_2193_tab;
+select b, length(b) from derby_2193_tab;
+
+--
+-- Errors should contain identifying line numbers
+--
+create table derby_2193_lineNumber
+(
+    a  int,
+    b  int
+);
+
+CALL SYSCS_UTIL.SYSCS_IMPORT_TABLE 
+( null, 'DERBY_2193_LINENUMBER', 'extin/derby-2193-linenumber.txt', null, null, null, 0 );
+select * from derby_2193_lineNumber;
+
+--
+-- end test case for derby-2193:
+--
+
+--
+-- begin test case for derby-2925:
+--
+-- Prevent export from overwriting existing files 
+--
+
+create table derby_2925_tab
+(
+    a  varchar( 50 ),
+    b  varchar( 50 )
+);
+
+--
+-- Testing SYSCS_UTIL.SYSCS_EXPORT_TABLE
+--
+
+CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE
+( null, 'DERBY_2925_TAB', 'extout/derby-2925.txt', null, null, null);
+--
+-- Errors should should happen in the second
+-- call to SYSCS_UTIL.SYSCS_EXPORT_TABLE
+-- since extout/derby-2925.txt already exists. 
+--
+CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE
+( null, 'DERBY_2925_TAB', 'extout/derby-2925.txt', null, null, null);
+
+--
+-- Testing SYSCS_UTIL.SYSCS_EXPORT_QUERY
+--
+
+CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY
+('select * from DERBY_2925_TAB', 'extout/derby-2925-query.dat', null , null , null ) ;
+--
+-- Errors should should happen in the second
+-- call to SYSCS_UTIL.SYSCS_EXPORT_QUERY
+-- since extout/derby-2925-query.dat already exists.
+--
+CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY
+('select * from DERBY_2925_TAB', 'extout/derby-2925-query.dat', null , null , null ) ;
+
+--
+-- Testing SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+--
+
+create table derby_2925_lob
+(
+	id 	int,
+        name 	varchar(30),
+        content clob, 
+        pic 	blob 
+);
+
+--
+-- Testing SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+-- where data file exists.
+--
+
+CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+('SELECT * FROM DERBY_2925_LOB','extout/derby-2925_data.dat', '\t' ,'|','UTF-16','extout/derby-2925_lobs.dat');
+--
+-- Errors should should happen in the second
+-- call to SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+-- since extout/derby-2925_data.dat already exists.
+--
+CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+('SELECT * FROM DERBY_2925_LOB','extout/derby-2925_data.dat', '\t' ,'|','UTF-16','extout/derby-2925_lobs.dat');
+
+--
+-- Testing SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+-- where lob file exists.
+--
+-- Errors should should happen in the 
+-- call to SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+-- since extout/derby-2925_lobs.dat already exists.
+--
+
+CALL SYSCS_UTIL.SYSCS_EXPORT_QUERY_LOBS_TO_EXTFILE
+('SELECT * FROM DERBY_2925_LOB','extout/derby-2925_data1.dat', '\t' ,'|','UTF-16','extout/derby-2925_lobs.dat');
+
+--
+-- end test case for derby-2925:

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

Added: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties?rev=691506&view=auto
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
(added)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/importExportIJ_app.properties
Tue Sep  2 20:51:49 2008
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to you under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+supportfiles=testData/ImportExport/AccountData_defaultformat.dat,testData/ImportExport/AccountData_format1.dat,testData/ImportExport/AccountData_format2.dat,testData/ImportExport/AccountData_format2oops.dat,testData/ImportExport/Access1.txt,testData/ImportExport/TwoLineBadEOF.dat,testData/ImportExport/NoEOR.dat,testData/ImportExport/AccountData_tabdel.dat,testData/ImportExport/AccountData_NullFields.dat,testData/ImportExport/UnsupportedFormat1.dat,testData/ImportExport/UnsupportedFormat2.dat,testData/ImportExport/derby-2193.txt,testData/ImportExport/derby-2193-linenumber.txt
+usedefaults=true
+useextdirs=true

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



Mime
View raw message