Changeset: f28fc2ea8799 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f28fc2ea8799
Branch: const_aggr_elim
Log Message:
Merges default
diffs (truncated from 919 to 300 lines):
diff --git a/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
b/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
--- a/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
+++ b/ctest/tools/monetdbe/Tests/example_proxy.SQL.py
@@ -1,4 +1,5 @@
-import os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os
import subprocess
db = os.getenv("TSTDB")
diff --git a/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.py
b/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.py
--- a/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.py
+++ b/sql/test/BugTracker-2009/Tests/bit_and.SF-2850341.py
@@ -1,4 +1,5 @@
-import sys, os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git
a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
--- a/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/interrupted-initialization.Bug-2875.SQL.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
except ImportError:
diff --git a/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
b/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
--- a/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/many-connects-cache.Bug-2904.SQL.py
@@ -1,4 +1,5 @@
-import sys, os, pymonetdb, threading
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os, threading
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git a/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
--- a/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/python-connections-Bug.2901.SQL.py
@@ -1,4 +1,4 @@
-import pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
import os
c = pymonetdb.connect(port=int(os.getenv('MAPIPORT')),
diff --git
a/sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.SQL.py
b/sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.SQL.py
--- a/sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.SQL.py
+++ b/sql/test/BugTracker-2011/Tests/user_create_temp_table.Bug-2916.SQL.py
@@ -1,4 +1,5 @@
-import sys, os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git
a/sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py
b/sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py
--- a/sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py
+++ b/sql/test/BugTracker-2012/Tests/day-of-month-localization.Bug-2962.SQL.py
@@ -1,4 +1,5 @@
-import time, sys, os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import time, sys, os
client1 = pymonetdb.connect(database=os.getenv("TSTDB"),
port=int(os.getenv("MAPIPORT")))
cur1 = client1.cursor()
diff --git
a/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
b/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
---
a/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
+++
b/sql/test/BugTracker-2012/Tests/large-number-operation-strange-results.Bug-2929.py
@@ -1,4 +1,5 @@
-import sys, os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
from decimal import *
db = os.getenv("TSTDB")
diff --git
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
---
a/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
+++
b/sql/test/BugTracker-2012/Tests/table_functions_fail_after_restart.Bug-3063.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
diff --git a/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
b/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
--- a/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
+++ b/sql/test/BugTracker-2013/Tests/binary_copy_into.Bug-3345.SQL.py
@@ -1,4 +1,5 @@
-import os, sys, shutil, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, shutil
src = os.environ['RELSRCDIR']
dst = os.environ['TSTTRGDIR']
diff --git
a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
--- a/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
+++ b/sql/test/BugTracker-2013/Tests/corrupt-after-restart.Bug-3282.SQL.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
except ImportError:
diff --git a/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
b/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
--- a/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
+++ b/sql/test/BugTracker-2013/Tests/empty-strings.Bug-3261.SQL.py
@@ -1,4 +1,5 @@
-import pymonetdb, sys, os
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
port = int(os.environ['MAPIPORT'])
db = os.environ['TSTDB']
diff --git a/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
b/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
--- a/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
+++ b/sql/test/BugTracker-2014/Tests/acidity-fail.Bug-3635.py
@@ -3,7 +3,8 @@ try:
except ImportError:
import process
-import sys, time, pymonetdb, os
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, time, os
def connect(autocommit):
return pymonetdb.connect(database = os.getenv('TSTDB'),
diff --git a/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
b/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
--- a/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/copy-into.Bug-3481.SQL.py
@@ -1,4 +1,5 @@
-import os, sys, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys
def connect():
return pymonetdb.connect(database = os.getenv('TSTDB'),
diff --git a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
--- a/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/python-microseconds.Bug-3439.SQL.py
@@ -1,4 +1,5 @@
-import datetime, sys, pymonetdb, os
+from MonetDBtesting import tpymonetdb as pymonetdb
+import datetime, sys, os
dbh =
pymonetdb.connect(port=int(os.getenv('MAPIPORT')),hostname=os.getenv('MAPIHOST'),database=os.getenv('TSTDB'))
cursor = dbh.cursor()
diff --git a/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
b/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
--- a/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
+++ b/sql/test/BugTracker-2014/Tests/utf8bom.Bug-3436.SQL.py
@@ -1,4 +1,5 @@
-import os, sys, zipfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, zipfile
TSTTRGDIR = os.environ['TSTTRGDIR']
diff --git a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
--- a/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/acidity2-fail.Bug-3635.SQL.py
@@ -1,4 +1,5 @@
-import pymonetdb, os
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os
def connect(autocommit):
return pymonetdb.connect(database = os.getenv('TSTDB'),
diff --git a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.SQL.py
b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.SQL.py
--- a/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/concurrent-schema.Bug-3826.SQL.py
@@ -1,4 +1,5 @@
-import pymonetdb, time, threading, os
+from MonetDBtesting import tpymonetdb as pymonetdb
+import time, threading, os
def monetSchema(tbl, host = os.getenv('MAPIHOST', 'localhost'),
port = int(os.getenv('MAPIPORT', '50000')),
diff --git a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
--- a/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
+++ b/sql/test/BugTracker-2015/Tests/crash_timestamp_convert.Bug-3816.py
@@ -1,4 +1,5 @@
-import sys, os, platform, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os, platform
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git
a/sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
b/sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
--- a/sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/local-remotetable-crash.Bug-3754.SQL.py
@@ -1,4 +1,5 @@
-import os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
--- a/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
+++ b/sql/test/BugTracker-2015/Tests/schemadiff.Bug-3778.SQL.py
@@ -4,7 +4,8 @@ Test if server doesn't crash when remote
Current result is an mal error (compilation failed)
"""
-import os, sys, pymonetdb, threading, tempfile
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, threading, tempfile
try:
from MonetDBtesting import process
except ImportError:
diff --git
a/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
b/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
---
a/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
+++
b/sql/test/BugTracker-2018/Tests/dependency_column_on_sequence.Bug-6618.SQL.py
@@ -1,4 +1,5 @@
-import sys, pymonetdb, os
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
# Test automatically created sequence:
db = os.getenv("TSTDB")
diff --git
a/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
b/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
---
a/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
+++
b/sql/test/BugTracker-2018/Tests/local_replica_table_not_detected.Bug-6620.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
--- a/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
+++ b/sql/test/BugTracker-2018/Tests/remote-table-where-is-null.Bug-6601.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
diff --git
a/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
b/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
--- a/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
+++ b/sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
diff --git a/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
b/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
--- a/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
+++ b/sql/test/BugTracker-2019/Tests/alter_table_drop_column.Bug-6749.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
except ImportError:
diff --git a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
b/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
--- a/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
+++ b/sql/test/BugTracker-2019/Tests/python-loader-string.Bug-6759.py
@@ -1,4 +1,5 @@
-import sys, os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git
a/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
b/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
---
a/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
+++
b/sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
@@ -1,4 +1,5 @@
-import os, sys, tempfile, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import os, sys, tempfile
try:
from MonetDBtesting import process
diff --git a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
--- a/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
+++ b/sql/test/BugTracker-2020/Tests/alter-table-add-column.Bug-6816.py
@@ -1,4 +1,5 @@
-import sys, os, pymonetdb
+from MonetDBtesting import tpymonetdb as pymonetdb
+import sys, os
db = os.getenv("TSTDB")
port = int(os.getenv("MAPIPORT"))
diff --git a/sql/test/BugTracker-2020/Tests/dbfarm-foreign-chars.Bug-7031.py
b/sql/test/BugTracker-2020/Tests/dbfarm-foreign-chars.Bug-7031.py
--- a/sql/test/BugTracker-2020/Tests/dbfarm-foreign-chars.Bug-7031.py
+++ b/sql/test/BugTracker-2020/Tests/dbfarm-foreign-chars.Bug-7031.py
@@ -1,4 +1,5 @@
-import sys, os, tempfile, pymonetdb
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
