Update of /cvsroot/monetdb/sql/src/test/Triggers/Tests
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv13939/src/test/Triggers/Tests
Modified Files:
Tag: Nov2009
trigger_owner.SQL.py
Log Message:
propagated changes of Wednesday Oct 14 2009
from the Aug2009 branch to the Nov2009 branch
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2009/10/14 - sjoerd: src/test/Triggers/Tests/trigger_owner.SQL.py,1.6.6.1
Cleanup subprocess use.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trigger_owner.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Triggers/Tests/trigger_owner.SQL.py,v
retrieving revision 1.6.8.1
retrieving revision 1.6.8.2
diff -u -d -r1.6.8.1 -r1.6.8.2
--- trigger_owner.SQL.py 12 Oct 2009 15:36:22 -0000 1.6.8.1
+++ trigger_owner.SQL.py 14 Oct 2009 12:04:54 -0000 1.6.8.2
@@ -1,23 +1,23 @@
import os, sys
import subprocess
-def client(cmd):
- clt = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
- sys.stdout.write(clt.stdout.read())
- clt.stdout.close()
- sys.stderr.write(clt.stderr.read())
- clt.stderr.close()
+def client(cmd, infile):
+ clt = subprocess.Popen(cmd, shell=True, universal_newlines=True,
stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ out, err = clt.communicate(open(infile).read())
+ sys.stdout.write(out)
+ sys.stderr.write(err)
def main():
- clcmd = str(os.getenv('SQL_CLIENT')) + "< %s" %
('%s/../trigger_owner_create.sql' % os.getenv('RELSRCDIR'))
- clcmd1 = str(os.getenv('SQL_CLIENT')) + " -uuser_test -Ppass < %s" %
('%s/../trigger_owner.sql' % os.getenv('RELSRCDIR'))
- clcmd2 = str(os.getenv('SQL_CLIENT')) + "< %s" %
('%s/../trigger_owner_drop.sql' % os.getenv('RELSRCDIR'))
+ clcmd = os.getenv('SQL_CLIENT')
+ clcmd1 = os.getenv('SQL_CLIENT') + " -uuser_test -Ppass"
+ clcmd2 = os.getenv('SQL_CLIENT')
+ relsrcdir = os.getenv('RELSRCDIR')
sys.stdout.write('trigger owner\n')
- client(clcmd)
- client(clcmd1)
- client(clcmd2)
+ client(clcmd, os.path.join(relsrcdir, '..', 'trigger_owner_create.sql'))
+ client(clcmd1, os.path.join(relsrcdir, '..', 'trigger_owner.sql'))
+ client(clcmd2, os.path.join(relsrcdir, '..', 'trigger_owner_drop.sql'))
sys.stdout.write('done\n')
main()
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
