Update of /cvsroot/monetdb/sql/src/test/Users/Tests
In directory
sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv31846/src/test/Users/Tests
Modified Files:
role1.SQL.py role2.SQL.py table.SQL.py
Log Message:
propagated changes of Monday Oct 22 2007 - Monday Oct 22 2007
from the SQL_2-20 branch to the development trunk
Index: table.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Users/Tests/table.SQL.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- table.SQL.py 15 Oct 2007 15:29:56 -0000 1.3
+++ table.SQL.py 22 Oct 2007 12:25:13 -0000 1.4
@@ -7,16 +7,16 @@
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()
-
+ 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 main():
- clcmd = str(os.getenv('SQL_CLIENT')) + "-umy_user -Pp1 < %s" %
('%s/../table.sql' % os.getenv('RELSRCDIR'))
- client(clcmd)
+ clcmd = str(os.getenv('SQL_CLIENT')) + "-umy_user -Pp1 < %s" %
('%s/../table.sql' % os.getenv('RELSRCDIR'))
+ client(clcmd)
main()
Index: role1.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Users/Tests/role1.SQL.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- role1.SQL.py 15 Oct 2007 15:29:55 -0000 1.3
+++ role1.SQL.py 22 Oct 2007 12:25:12 -0000 1.4
@@ -7,16 +7,16 @@
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()
-
+ 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 main():
- clcmd = str(os.getenv('SQL_CLIENT')) + "-umy_user -Pp1 < %s" %
('%s/../role.sql' % os.getenv('RELSRCDIR'))
- client(clcmd)
+ clcmd = str(os.getenv('SQL_CLIENT')) + "-umy_user -Pp1 < %s" %
('%s/../role.sql' % os.getenv('RELSRCDIR'))
+ client(clcmd)
main()
Index: role2.SQL.py
===================================================================
RCS file: /cvsroot/monetdb/sql/src/test/Users/Tests/role2.SQL.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- role2.SQL.py 15 Oct 2007 15:29:56 -0000 1.3
+++ role2.SQL.py 22 Oct 2007 12:25:12 -0000 1.4
@@ -6,15 +6,15 @@
import MonetDB.subprocess26 as 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()
-
+ 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 main():
- clcmd = str(os.getenv('SQL_CLIENT')) + "-umy_user2 -Pp2 < %s" %
('%s/../role.sql' % os.getenv('RELSRCDIR'))
- client(clcmd)
+ clcmd = str(os.getenv('SQL_CLIENT')) + "-umy_user2 -Pp2 < %s" %
('%s/../role.sql' % os.getenv('RELSRCDIR'))
+ client(clcmd)
main()
-------------------------------------------------------------------------
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
