Update of /cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.8/Tests
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv29983
Modified Files:
Tag: SQL_2-20
MapiClient-dump.SF-905851.SQL.py
Log Message:
1. Do not mix %-formatting and string concatenation with + in a single
expression to build a single string.
2. $MONETDB_PREFIX/bin *must* be in your PATH before you run any
tests, so don't bother adding that to Mlog. Since $MONETDB_PREFIX may
well contain spaces, it should have been quoted using double quotes
otherwise.
I maintain that this 26 line Python approach is *not* less maintenance
burden than having two 5 line scripts (of which 3 were actually
effective).
Index: MapiClient-dump.SF-905851.SQL.py
===================================================================
RCS file:
/cvsroot/monetdb/sql/src/test/BugDay_2005-10-06_2.8/Tests/MapiClient-dump.SF-905851.SQL.py,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- MapiClient-dump.SF-905851.SQL.py 22 Oct 2007 12:13:56 -0000 1.1.2.4
+++ MapiClient-dump.SF-905851.SQL.py 24 Oct 2007 15:41:38 -0000 1.1.2.5
@@ -16,9 +16,9 @@
def main():
- clcmd = ("%s/bin/Mlog -x " % os.getenv('MONETDB_PREFIX')) +
str(os.getenv('SQL_CLIENT')) + "< %s" % ('%s/JdbcClient_create_tables.sql' %
os.getenv('RELSRCDIR'))
- clcmd1 = ("%s/bin/Mlog -x " % os.getenv('MONETDB_PREFIX')) +
str(os.getenv('SQL_CLIENT')) + "< %s" % ('%s/JdbcClient_inserts_selects.sql' %
os.getenv('RELSRCDIR'))
- clcmd2 = ("%s/bin/Mlog -x " % os.getenv('MONETDB_PREFIX')) +
str(os.getenv('SQL_DUMP'))
+ clcmd = 'Mlog -x %s < %s/JdbcClient_create_tables.sql' %
(os.getenv('SQL_CLIENT'), os.getenv('RELSRCDIR'))
+ clcmd1 = 'Mlog -x %s < %s/JdbcClient_inserts_selects.sql' %
(os.getenv('SQL_CLIENT'), os.getenv('RELSRCDIR'))
+ clcmd2 = 'Mlog -x %s' % os.getenv('SQL_DUMP')
client(clcmd)
client(clcmd1)
client(clcmd2)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
