Changeset: 679259da51cf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=679259da51cf
Modified Files:
buildtools/doc/windowsbuild.rst
sql/test/BugTracker-2019/Tests/remote-table-non-existent-column.Bug-6750.py
Branch: default
Log Message:
Merge with Nov2019
diffs (130 lines):
diff --git a/buildtools/doc/windowsbuild.rst b/buildtools/doc/windowsbuild.rst
--- a/buildtools/doc/windowsbuild.rst
+++ b/buildtools/doc/windowsbuild.rst
@@ -340,7 +340,7 @@ optional prerequisites iconv_ and zlib_,
Run the following commands in the ``win32`` subfolder, substituting
the correct locations for the iconv and zlib libraries::
- cscript configure.js compiler=msvc prefix=C:\Libraries\libxml2-2.9.8.win64 ^
+ cscript configure.js compiler=msvc prefix=C:\Libraries\libxml2-2.9.9.win64 ^
include=C:\Libraries\iconv-1.15.win64\include;C:\Libraries\zlib-1.2.11.win64\include
^
lib=C:\Libraries\iconv-1.15.win64\lib;C:\Libraries\zlib-1.2.11.win64\lib ^
iconv=yes zlib=yes vcmanifest=yes
@@ -476,8 +476,6 @@ the following extra Cygwin packages in o
prefix=/cygdrive/c/Libraries/iconv-1.16.win64-vs2019
export INCLUDE LIB PATH
win32_target=_WIN32_WINNT_WIN7
- prefix=/cygdrive/c/Libraries/iconv-1.15.win32-vs2015
- PATH="$prefix/bin:$PATH"
./configure --host=i686-w64-mingw32 --prefix="$prefix" \
CC="$PWD/build-aux/compile cl -nologo" \
CXX="$PWD/build-aux/compile cl -nologo" \
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
@@ -23,54 +23,57 @@ farm_dir = tempfile.mkdtemp()
prt1 = freeport()
os.makedirs(os.path.join(farm_dir, 'node1'))
-prc1 = process.server(mapiport=prt1, dbname='node1',
dbfarm=os.path.join(farm_dir, 'node1'), stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
-conn1 = pymonetdb.connect(database='node1', port=prt1, autocommit=True)
-cur1 = conn1.cursor()
-cur1.execute("start transaction;")
-cur1.execute("create table tab1 (col1 clob);")
-cur1.execute("insert into tab1 values ('a');")
-cur1.execute("create table tab2 (col1 tinyint);")
-cur1.execute("insert into tab2 values (1);")
-cur1.execute("commit;")
+try:
+ prc1 = process.server(mapiport=prt1, dbname='node1',
dbfarm=os.path.join(farm_dir, 'node1'), stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
+ try:
+ conn1 = pymonetdb.connect(database='node1', port=prt1, autocommit=True)
+ cur1 = conn1.cursor()
+ cur1.execute("start transaction;")
+ cur1.execute("create table tab1 (col1 clob);")
+ cur1.execute("insert into tab1 values ('a');")
+ cur1.execute("create table tab2 (col1 tinyint);")
+ cur1.execute("insert into tab2 values (1);")
+ cur1.execute("commit;")
-prt2 = freeport()
-os.makedirs(os.path.join(farm_dir, 'node2'))
-prc2 = process.server(mapiport=prt2, dbname='node2',
dbfarm=os.path.join(farm_dir, 'node2'), stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
-conn2 = pymonetdb.connect(database='node2', port=prt2, autocommit=True)
-cur2 = conn2.cursor()
-cur2.execute("create remote table tab1 (col1 clob, col2 int) on
'mapi:monetdb://localhost:"+str(prt1)+"/node1';")
-cur2.execute("create remote table tab2 (col1 double) on
'mapi:monetdb://localhost:"+str(prt1)+"/node1';")
-try:
- cur2.execute("select col2 from tab1;") # col2 doesn't exist
-except pymonetdb.OperationalError as e:
- print(e)
-try:
- cur2.execute("select col1 from tab2;") # col1 is not a floating point
column
-except pymonetdb.OperationalError as e:
- print(e)
-cur2.execute("drop table tab1;")
-cur2.execute("drop table tab2;")
+ prt2 = freeport()
+ os.makedirs(os.path.join(farm_dir, 'node2'))
+ prc2 = process.server(mapiport=prt2, dbname='node2',
dbfarm=os.path.join(farm_dir, 'node2'), stdin=process.PIPE,
stdout=process.PIPE, stderr=process.PIPE)
+ try:
+ conn2 = pymonetdb.connect(database='node2', port=prt2,
autocommit=True)
+ cur2 = conn2.cursor()
+ cur2.execute("create remote table tab1 (col1 clob, col2 int) on
'mapi:monetdb://localhost:"+str(prt1)+"/node1';")
+ cur2.execute("create remote table tab2 (col1 double) on
'mapi:monetdb://localhost:"+str(prt1)+"/node1';")
+ try:
+ cur2.execute("select col2 from tab1;") # col2 doesn't exist
+ except pymonetdb.OperationalError as e:
+ print(e)
+ try:
+ cur2.execute("select col1 from tab2;") # col1 is not a
floating point column
+ except pymonetdb.OperationalError as e:
+ print(e)
+ cur2.execute("drop table tab1;")
+ cur2.execute("drop table tab2;")
-# Remote tables referencing merge tables in a loop
-cur1.execute("create merge table m1 (col1 clob);")
-cur2.execute("create merge table m2 (col1 clob);")
-cur1.execute("create remote table m2 (col1 clob) on
'mapi:monetdb://localhost:"+str(prt2)+"/node2';")
-cur2.execute("create remote table m1 (col1 clob) on
'mapi:monetdb://localhost:"+str(prt1)+"/node1';")
-cur1.execute("alter table m1 add table m2;")
-cur2.execute("alter table m2 add table m1;")
-cur2.execute("select * from m2;")
+ # Remote tables referencing merge tables in a loop
+ cur1.execute("create merge table m1 (col1 clob);")
+ cur2.execute("create merge table m2 (col1 clob);")
+ cur1.execute("create remote table m2 (col1 clob) on
'mapi:monetdb://localhost:"+str(prt2)+"/node2';")
+ cur2.execute("create remote table m1 (col1 clob) on
'mapi:monetdb://localhost:"+str(prt1)+"/node1';")
+ cur1.execute("alter table m1 add table m2;")
+ cur2.execute("alter table m2 add table m1;")
+ cur2.execute("select * from m2;")
-cur1.close()
-conn1.close()
-cur2.close()
-conn2.close()
-
-out, err = prc1.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-out, err = prc2.communicate()
-sys.stdout.write(out)
-sys.stderr.write(err)
-
-shutil.rmtree(farm_dir)
+ cur1.close()
+ conn1.close()
+ cur2.close()
+ conn2.close()
+ finally:
+ out, err = prc2.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+ finally:
+ out, err = prc1.communicate()
+ sys.stdout.write(out)
+ sys.stderr.write(err)
+finally:
+ shutil.rmtree(farm_dir)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
