Changeset: 4a5ec936f4c8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4a5ec936f4c8
Modified Files:
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/test/pg_regress/Tests/alter_table.stable.err
sql/test/pg_regress/Tests/int8.stable.err
sql/test/pg_regress/Tests/int8.stable.out
sql/test/pg_regress/Tests/strings.stable.err
Branch: scoping2
Log Message:
Merged with default
diffs (257 lines):
diff --git a/clients/odbc/driver/CMakeLists.txt
b/clients/odbc/driver/CMakeLists.txt
--- a/clients/odbc/driver/CMakeLists.txt
+++ b/clients/odbc/driver/CMakeLists.txt
@@ -103,7 +103,7 @@ target_sources(MonetODBC
SQLTables.c
SQLTransact.c
driver.rc
- ODBC.syms)
+ ODBC.def)
target_include_directories(MonetODBC
PRIVATE
diff --git a/clients/odbc/driver/ODBC.syms b/clients/odbc/driver/ODBC.def
rename from clients/odbc/driver/ODBC.syms
rename to clients/odbc/driver/ODBC.def
--- a/clients/odbc/driver/ODBC.syms
+++ b/clients/odbc/driver/ODBC.def
@@ -1,3 +1,4 @@
+EXPORTS
DllMain
SQLAllocConnect
SQLAllocEnv
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -22,10 +22,10 @@ BEGIN
VALUE "CompanyName", "MonetDB B.V.\0"
VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
VALUE "FileVersion", sversion(11,40,0)
- VALUE "InternalName", "libMonetODBC\0"
+ VALUE "InternalName", "MonetODBC\0"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020\0"
VALUE "LegalTrademarks", "\0"
- VALUE "OriginalFilename", "libMonetODBC.dll\0"
+ VALUE "OriginalFilename", "MonetODBC.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "MonetDB SQL Server\0"
VALUE "ProductVersion", sversion(11,40,0)
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -13,7 +13,7 @@ target_sources(MonetODBCs
PRIVATE
setup.c
setup.rc
- setup.syms
+ setup.def
resource.h)
target_include_directories(MonetODBCs
diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c
--- a/clients/odbc/winsetup/install.c
+++ b/clients/odbc/winsetup/install.c
@@ -20,8 +20,8 @@
static char *DriverName = "MonetDB ODBC Driver";
static char *DataSourceName = "MonetDB";
-static char *DriverDLL = "libMonetODBC" DLL;
-static char *DriverDLLs = "libMonetODBCs" DLL;
+static char *DriverDLL = "MonetODBC" DLL;
+static char *DriverDLLs = "MonetODBCs" DLL;
/* General error handler for installer functions */
diff --git a/clients/odbc/winsetup/setup.syms b/clients/odbc/winsetup/setup.def
rename from clients/odbc/winsetup/setup.syms
rename to clients/odbc/winsetup/setup.def
--- a/clients/odbc/winsetup/setup.syms
+++ b/clients/odbc/winsetup/setup.def
@@ -1,3 +1,4 @@
+EXPORTS
DllMain
ConfigDSN
ConfigDriver
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -84,9 +84,9 @@ BEGIN
VALUE "CompanyName", "MonetDB B.V."
VALUE "FileDescription", "MonetDB ODBC Setup DLL"
VALUE "FileVersion", sversion(11,40,0)
- VALUE "InternalName", "libMonetODBCs.dll"
+ VALUE "InternalName", "MonetODBCs.dll"
VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2020"
- VALUE "OriginalFilename", "libMonetODBCs.dll"
+ VALUE "OriginalFilename", "MonetODBCs.dll"
VALUE "ProductName", "MonetDB SQL Server"
VALUE "ProductVersion", sversion(11,40,0)
END
diff --git a/sql/test/pg_regress/Tests/int8.stable.err
b/sql/test/pg_regress/Tests/int8.stable.err
--- a/sql/test/pg_regress/Tests/int8.stable.err
+++ b/sql/test/pg_regress/Tests/int8.stable.err
@@ -64,74 +64,74 @@ CODE = 22003
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_1, to_char(q1, '9G999G999G999G999G999'),
to_char(q2, '9,999,999,999,999,999')
FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_2, to_char(q1, '9G999G999G999G999G999D999G999'),
to_char(q2, '9,999,999,999,999,999.999,999')
FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_3, to_char( (q1 * -1), '9999999999999999PR'),
to_char( (q2 * -1), '9999999999999999.999PR')
FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_4, to_char( (q1 * -1), '9999999999999999S'),
to_char( (q2 * -1), 'S9999999999999999')
FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_5, to_char(q2, 'MI9999999999999999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_6, to_char(q2, 'FMS9999999999999999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_7, to_char(q2, 'FM9999999999999999THPR') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_8, to_char(q2, 'SG9999999999999999th') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_9, to_char(q2, '0999999999999999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_14, to_char(q2, 'FM9999999999999999.999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_15, to_char(q2, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9
9 . 9 9 9') FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = monetdb@WIN2K12R2:33746
QUERY = SELECT '' AS to_char_16, to_char(q2, E'99999 "text" 9999 "9999" 999
"\\"text between quote marks\\"" 9999') FROM INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT '' AS to_char_17, to_char(q2, '999999SG9999999999') FROM
INT8_TBL;
-ERROR = !SELECT: no such binary operator 'to_char(bigint,char)'
+ERROR = !SELECT: no such binary operator 'to_char'(bigint,char)
CODE = 42000
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/int8.stable.out
b/sql/test/pg_regress/Tests/int8.stable.out
--- a/sql/test/pg_regress/Tests/int8.stable.out
+++ b/sql/test/pg_regress/Tests/int8.stable.out
@@ -91,7 +91,7 @@ stdout of test 'int8` in directory 'sql/
[ "", 4567890123456789, -4567890123456789, 9135780246913578 ]
#SELECT '' AS three, q1, q2, q1 * q2 AS multiply FROM INT8_TBL
# WHERE q1 < 1000 or (q2 > 0 and q2 < 1000);
-% .%1, sys.int8_tbl, sys.int8_tbl, sys.%4 # table_name
+% ., sys.int8_tbl, sys.int8_tbl, sys. # table_name
% three, q1, q2, multiply # name
% char, bigint, bigint, bigint # type
% 0, 16, 16, 18 # length
diff --git a/sql/test/pg_regress/Tests/strings.stable.err
b/sql/test/pg_regress/Tests/strings.stable.err
--- a/sql/test/pg_regress/Tests/strings.stable.err
+++ b/sql/test/pg_regress/Tests/strings.stable.err
@@ -59,35 +59,35 @@ ERROR = !conversion of string 'b(.*)f' t
CODE = 22018
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT OVERLAY('abcdef' PLACING '45' FROM 4) AS "abc45f";
-ERROR = !syntax error, unexpected IDENT, expecting ')' or ',' in: "select
overlay('abcdef' placing"
+ERROR = !syntax error in: "select overlay('abcdef' placing"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT OVERLAY('yabadoo' PLACING 'daba' FROM 5) AS "yabadaba";
-ERROR = !syntax error, unexpected IDENT, expecting ')' or ',' in: "select
overlay('yabadoo' placing"
+ERROR = !syntax error in: "select overlay('yabadoo' placing"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT OVERLAY('yabadoo' PLACING 'daba' FROM 5 FOR 0) AS "yabadabadoo";
-ERROR = !syntax error, unexpected IDENT, expecting ')' or ',' in: "select
overlay('yabadoo' placing"
+ERROR = !syntax error in: "select overlay('yabadoo' placing"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = SELECT OVERLAY('babosa' PLACING 'ubb' FROM 2 FOR 4) AS "bubba";
-ERROR = !syntax error, unexpected IDENT, expecting ')' or ',' in: "select
overlay('babosa' placing"
+ERROR = !syntax error in: "select overlay('babosa' placing"
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = insert into toasttest
values(decode(repeat('1234567890',10000),'escape'));
-ERROR = !SELECT: no such binary operator 'decode(char,char)'
+ERROR = !SELECT: no such binary operator 'decode'(char,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = insert into toasttest
values(decode(repeat('1234567890',10000),'escape'));
-ERROR = !SELECT: no such binary operator 'decode(char,char)'
+ERROR = !SELECT: no such binary operator 'decode'(char,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = insert into toasttest
values(decode(repeat('1234567890',10000),'escape'));
-ERROR = !SELECT: no such binary operator 'decode(char,char)'
+ERROR = !SELECT: no such binary operator 'decode'(char,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = insert into toasttest
values(decode(repeat('1234567890',10000),'escape'));
-ERROR = !SELECT: no such binary operator 'decode(char,char)'
+ERROR = !SELECT: no such binary operator 'decode'(char,char)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = select split_part('joeuser@mydatabase','@',0) AS "an error";
@@ -95,11 +95,11 @@ ERROR = !field position must be greater
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = select to_hex(256*256*256 - 1) AS "ffffff";
-ERROR = !SELECT: no such unary operator 'to_hex(int)'
+ERROR = !SELECT: no such unary operator 'to_hex'(int)
CODE = 42000
MAPI = (monetdb) /var/tmp/mtest-3604/.s.monetdb.35433
QUERY = select to_hex(cast(256 as bigint)*cast(256 as bigint)*cast(256 as
bigint)*cast(256 as bigint) - 1) AS "ffffffff";
-ERROR = !SELECT: no such unary operator 'to_hex(bigint)'
+ERROR = !SELECT: no such unary operator 'to_hex'(bigint)
CODE = 42000
# 17:11:19 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
