You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2008/01/17 21:46:23 UTC
svn commit: r612973 - in /db/derby/code/branches/10.3/java: demo/toursdb/
testing/org/apache/derbyTesting/functionTests/master/
testing/org/apache/derbyTesting/functionTests/tests/demo/
Author: myrnavl
Date: Thu Jan 17 12:46:21 2008
New Revision: 612973
URL: http://svn.apache.org/viewvc?rev=612973&view=rev
Log:
backport (not simple merge) of revision 612827 and 612960 to 10.3:
replace gif files used to populate MAPS table in toursdb with images created
by me.
Added:
db/derby/code/branches/10.3/java/demo/toursdb/cupisle.gif (with props)
db/derby/code/branches/10.3/java/demo/toursdb/smallisle.gif (with props)
db/derby/code/branches/10.3/java/demo/toursdb/witchisle.gif (with props)
Removed:
db/derby/code/branches/10.3/java/demo/toursdb/BART.gif
db/derby/code/branches/10.3/java/demo/toursdb/Caltrain.gif
db/derby/code/branches/10.3/java/demo/toursdb/LightRail.gif
Modified:
db/derby/code/branches/10.3/java/demo/toursdb/build.xml
db/derby/code/branches/10.3/java/demo/toursdb/insertMaps.java
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB.java
db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB_app.properties
Modified: db/derby/code/branches/10.3/java/demo/toursdb/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/demo/toursdb/build.xml?rev=612973&r1=612972&r2=612973&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/demo/toursdb/build.xml (original)
+++ db/derby/code/branches/10.3/java/demo/toursdb/build.xml Thu Jan 17 12:46:21 2008
@@ -116,7 +116,7 @@
<target name="copyfiles">
<copy todir="${out.dir}/${derby.testing.functest.dir}/tests/demo">
<fileset dir="${derby.demo.src.dir}/toursdb"
- includes="*.sql,BART.gif,Caltrain.gif,LightRail.gif"/>
+ includes="*.sql,*.gif"/>
</copy>
</target>
Added: db/derby/code/branches/10.3/java/demo/toursdb/cupisle.gif
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/demo/toursdb/cupisle.gif?rev=612973&view=auto
==============================================================================
Binary file - no diff available.
Propchange: db/derby/code/branches/10.3/java/demo/toursdb/cupisle.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: db/derby/code/branches/10.3/java/demo/toursdb/insertMaps.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/demo/toursdb/insertMaps.java?rev=612973&r1=612972&r2=612973&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/demo/toursdb/insertMaps.java (original)
+++ db/derby/code/branches/10.3/java/demo/toursdb/insertMaps.java Thu Jan 17 12:46:21 2008
@@ -54,29 +54,29 @@
ps = connCS.prepareStatement
("insert into maps (map_name, region, area, photo_format, picture) values (?,?,?,?,?)");
- ps.setString(1,"BART");
- ps.setString(2,"Bay Area");
+ ps.setString(1,"North Ocean");
+ ps.setString(2,"Cup Island");
ps.setBigDecimal(3, new BigDecimal("1776.11"));
ps.setString(4,"gif");
- File file = new File ("BART.gif");
+ File file = new File ("cupisle.gif");
InputStream fileIn = new FileInputStream(file);
ps.setBinaryStream(5, fileIn, (int)file.length());
int numrows = ps.executeUpdate();
- ps.setString(1,"Caltrain");
- ps.setString(2,"West Bay");
+ ps.setString(1,"Middle Ocean");
+ ps.setString(2,"Small Island");
ps.setBigDecimal(3, new BigDecimal("1166.77"));
ps.setString(4,"gif");
- file = new File ("Caltrain.gif");
+ file = new File ("smallisle.gif");
fileIn = new FileInputStream(file);
ps.setBinaryStream(5, fileIn, (int)file.length());
numrows = numrows + ps.executeUpdate();
- ps.setString(1,"Light Rail");
- ps.setString(2,"Santa Clara Valley");
+ ps.setString(1,"South Ocean");
+ ps.setString(2,"Witch Island");
ps.setBigDecimal(3, new BigDecimal("9117.90"));
ps.setString(4,"gif");
- file = new File ("BART.gif");
+ file = new File ("witchisle.gif");
fileIn = new FileInputStream(file);
ps.setBinaryStream(5, fileIn, (int)file.length());
numrows = numrows + ps.executeUpdate();
Added: db/derby/code/branches/10.3/java/demo/toursdb/smallisle.gif
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/demo/toursdb/smallisle.gif?rev=612973&view=auto
==============================================================================
Binary file - no diff available.
Propchange: db/derby/code/branches/10.3/java/demo/toursdb/smallisle.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: db/derby/code/branches/10.3/java/demo/toursdb/witchisle.gif
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/demo/toursdb/witchisle.gif?rev=612973&view=auto
==============================================================================
Binary file - no diff available.
Propchange: db/derby/code/branches/10.3/java/demo/toursdb/witchisle.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out?rev=612973&r1=612972&r2=612973&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/master/checkToursDB.out Thu Jan 17 12:46:21 2008
@@ -2828,7 +2828,7 @@
COUNTRY is first: United States, COUNTRY is then: United States of America
ECONOMY_SEATS_TAKEN is first: 2, ECONOMY_SEATS_TAKEN is then: 20
AIRCRAFT is first: B747, AIRCRAFT is then: B747
-REGION is first: Bay Area, REGION is then: San Francisco Bay Area
+REGION is first: Cup Island, REGION is then: Coffee Cup Island
STATUS is first: INSERTED FROM TRIG1, STATUS is then: over
deleted all from table AIRLINES
deleted all from table CITIES
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB.java?rev=612973&r1=612972&r2=612973&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB.java (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB.java Thu Jan 17 12:46:21 2008
@@ -125,12 +125,12 @@
if (rs.next())
System.out.println(", AIRCRAFT is then: " + rs.getString(1));
- ps = connCS.prepareStatement ("select REGION from MAPS where MAP_NAME = 'BART'" );
+ ps = connCS.prepareStatement ("select REGION from MAPS where MAP_NAME = 'North Ocean'" );
rs = ps.executeQuery();
if (rs.next())
System.out.print("REGION is first: " + rs.getString(1));
stmt = connCS.createStatement();
- stmt.execute("update MAPS set REGION='San Francisco Bay Area' where MAP_NAME = 'BART'");
+ stmt.execute("update MAPS set REGION='Coffee Cup Island' where MAP_NAME = 'North Ocean'");
rs = ps.executeQuery();
if (rs.next())
System.out.println(", REGION is then: " + rs.getString(1));
Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB_app.properties
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB_app.properties?rev=612973&r1=612972&r2=612973&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB_app.properties (original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/demo/checkToursDB_app.properties Thu Jan 17 12:46:21 2008
@@ -18,4 +18,4 @@
runwithfoundation=false
ij.database=jdbc:derby:toursDB;create=true
-supportfiles=tests/demo/ToursDB_schema.sql,tests/demo/loadTables.sql,tests/demo/loadAIRLINES.sql,tests/demo/loadCITIES.sql,tests/demo/loadCOUNTRIES.sql,tests/demo/loadFLIGHTAVAILABILITY1.sql,tests/demo/loadFLIGHTAVAILABILITY2.sql,tests/demo/loadFLIGHTS1.sql,tests/demo/loadFLIGHTS2.sql,tests/demo/BART.gif,tests/demo/Caltrain.gif,tests/demo/LightRail.gif
+supportfiles=tests/demo/ToursDB_schema.sql,tests/demo/loadTables.sql,tests/demo/loadAIRLINES.sql,tests/demo/loadCITIES.sql,tests/demo/loadCOUNTRIES.sql,tests/demo/loadFLIGHTAVAILABILITY1.sql,tests/demo/loadFLIGHTAVAILABILITY2.sql,tests/demo/loadFLIGHTS1.sql,tests/demo/loadFLIGHTS2.sql,tests/demo/cupisle.gif,tests/demo/smallisle.gif,tests/demo/witchisle.gif