Update of /cvsroot/monetdb/sql/src/test/Skyserver
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23290

Modified Files:
      Tag: Feb2010
        Skyserver_import.sql run.all 
Log Message:
make manual testing a bit easier


Index: Skyserver_import.sql
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Skyserver_import.sql,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -d -r1.6 -r1.6.4.1
--- Skyserver_import.sql        12 Sep 2009 20:13:53 -0000      1.6
+++ Skyserver_import.sql        24 Jan 2010 21:21:14 -0000      1.6.4.1
@@ -1,19 +1,16 @@
 
-COPY 25000 RECORDS INTO RC3 FROM 
-'DATA/RC3.dat.bz2' USING DELIMITERS '\t', '\015\n', '"';
+COPY 25000 RECORDS INTO RC3 FROM 'DATA/RC3.dat.bz2' USING DELIMITERS '\t', 
'\015\n', '"';
 
 COPY 30000 RECORDS INTO Stetson FROM 'DATA/Stetson.dat.bz2' USING DELIMITERS 
'\t', '\015\n', '"' NULL as '';
 
 COPY 1000 RECORDS INTO QsoCatalogAll FROM 'DATA/QsoCatalogAll.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
 
-
 COPY 100 RECORDS INTO QsoConcordance FROM 'DATA/QsoConcordance.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
 
 COPY 3000 RECORDS INTO Target FROM 'DATA/Target.dat.bz2' USING DELIMITERS 
'\t', '\015\n', '"';
 
 COPY 1000 RECORDS INTO TilingRun FROM 'DATA/TilingRun.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
 
-
 COPY 1000 RECORDS INTO TargetParam FROM 'DATA/TargetParam.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
 
 
@@ -79,7 +76,7 @@
 
 COPY 1000 RECORDS INTO QuasarCatalog FROM 'DATA/QuasarCatalog.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
 
-COPY 28000 RECORDS INTO SpecLineIndex FROM 'DATA/SpecLineIndex1.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
+--COPY 28000 RECORDS INTO SpecLineIndex FROM 'DATA/SpecLineIndex1.dat.bz2' 
USING DELIMITERS '\t', '\015\n', '"';
 
 COPY 39000 RECORDS INTO SpecLineAll FROM 'DATA/SpecLineAll.dat.bz2' USING 
DELIMITERS '\t', '\015\n', '"';
 

Index: run.all
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/run.all,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- run.all     7 Jan 2010 15:24:33 -0000       1.14
+++ run.all     24 Jan 2010 21:21:16 -0000      1.14.2.1
@@ -19,7 +19,6 @@
 
 PWD=`pwd`
 SQL='mclient -lsql'
-SQL1='mclient -lsql'
 if [ $# -eq 1 ]; then
        SQL=$1
 fi
@@ -28,31 +27,48 @@
 
 #Bulk-Load into SQL server...
 
-#echo Create User
-#$SQL < create_user.sql
+cat << EOF > .monetdb
+user=monetdb
+password=monetdb
+EOF
+
+echo Create User
+$SQL < create_user.sql
+
+cat << EOF > .monetdb
+user=skyserver
+password=skyserver
+EOF
+
+$SQL < ../../sql/math.sql
+$SQL < ../../sql/cache.sql
+$SQL < ../../sql/skyserver.sql
 
 echo tables
-$SQL1 < Skyserver_tables.sql
-$SQL1 < Skyserver_constraints.sql
+$SQL < Skyserver_tables.sql
+
+echo loading
+cat Skyserver_import.sql | sed -e "s|DATA|$PWD/microsky|g" | $SQL
+
+echo Constraints
+$SQL < Skyserver_constraints.sql
 
 echo views
-$SQL1 < Skyserver_views.sql
+$SQL < Skyserver_views.sql
 
 echo functions
-$SQL1 < ../../sql/math.sql
-$SQL1 < ../../sql/cache.sql
-$SQL1 < ../../sql/skyserver.sql
-$SQL1 < Skyserver_functions.sql
+$SQL < Skyserver_functions.sql
 
-exit
 echo Cleanup
-$SQL1 < Skyserver_dropFunctions.sql
-$SQL1 < Skyserver_dropMs_functions.sql
-$SQL1 < Skyserver_dropMath.sql
-$SQL1 < Skyserver_dropCache.sql
-$SQL1 < Skyserver_dropViews.sql
-$SQL1 < Skyserver_dropConstraints.sql
-$SQL1 < Skyserver_dropTables.sql
+$SQL < Skyserver_dropFunctions.sql
+$SQL < Skyserver_dropMs_functions.sql
+$SQL < Skyserver_dropMath.sql
+$SQL < Skyserver_dropCache.sql
+$SQL < Skyserver_dropViews.sql
+$SQL < Skyserver_dropConstraints.sql
+$SQL < Skyserver_dropTables.sql
 
 echo Remove User
 $SQL < drop_user.sql
+
+rm -f .monetdb


------------------------------------------------------------------------------
Throughout its 18-year history, RSA Conference consistently attracts the
world's best and brightest in the field, creating opportunities for Conference
attendees to learn about information security's most important issues through
interactions with peers, luminaries and emerging and established companies.
http://p.sf.net/sfu/rsaconf-dev2dev
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to