Update of /cvsroot/monetdb/sql/src/test/Skyserver/Tests
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13752/Tests
Modified Files:
Skyserver_v6.SQL.py
Log Message:
Use TSTSRCDIR to generate sql 'copy into' statements.
U Skyserver_v6.SQL.py
Index: Skyserver_v6.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Skyserver_v6.SQL.py 22 Jan 2009 16:43:07 -0000 1.4
+++ Skyserver_v6.SQL.py 23 Jan 2009 17:27:27 -0000 1.5
@@ -2,47 +2,48 @@
def main():
+ dir = os.getenv('TSTSRCDIR')
clcmd = str(os.getenv('SQL_CLIENT'))
clcmd1 = str(os.getenv('SQL_CLIENT')) + " -uskyserver -Pskyserver"
sys.stdout.write('Create User\n')
- clt = os.popen(clcmd + "<%s" % ('%s/../create_user.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt = os.popen(clcmd + "<%s" % ('%s/../create_user.sql' % dir), 'w')
clt.close()
sys.stdout.write('tables\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/math.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/math.sql' % dir), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/cache.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/cache.sql' % dir), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/skyserver.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../../../sql/skyserver.sql' % dir),
'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_tables_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_tables_v6.sql' % dir),
'w')
clt1.close()
- clt1 = os.popen("cat %s/../Skyserver_import_v6.sql | sed -e
\"s|DATA_DIR|%s/../microsky_v6|g\" | %s " % (os.getenv('RELSRCDIR'),
os.getenv('RELSRCDIR'), clcmd1), 'w')
+ clt1 = os.popen("cat %s/../Skyserver_import_v6.sql | sed -e
\"s|DATA_DIR|%s/../microsky_v6|g\" | %s " % (dir, dir, clcmd1), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_constraints_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_constraints_v6.sql' %
dir), 'w')
clt1.close()
sys.stdout.write('views\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_views_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_views_v6.sql' % dir),
'w')
clt1.close()
sys.stdout.write('functions\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_functions_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_functions_v6.sql' %
dir), 'w')
clt1.close()
sys.stdout.write('Cleanup\n')
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropFunctions_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropFunctions_v6.sql' %
dir), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMs_functions.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMs_functions.sql' %
dir), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMath.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropMath.sql' % dir),
'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropCache.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropCache.sql' % dir),
'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropViews_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropViews_v6.sql' %
dir), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropConstraints_v6.sql'
% os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropConstraints_v6.sql'
% dir), 'w')
clt1.close()
- clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropTables_v6.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt1 = os.popen(clcmd1 + "<%s" % ('%s/../Skyserver_dropTables_v6.sql' %
dir), 'w')
clt1.close()
sys.stdout.write('Remove User\n')
- clt = os.popen(clcmd + "<%s" % ('%s/../drop_user.sql' %
os.getenv('RELSRCDIR')), 'w')
+ clt = os.popen(clcmd + "<%s" % ('%s/../drop_user.sql' % dir), 'w')
clt.close()
main()
------------------------------------------------------------------------------
This SF.net email is sponsored by:
SourcForge Community
SourceForge wants to tell your story.
http://p.sf.net/sfu/sf-spreadtheword
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
