Changeset: 7589c5b0d1ec for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7589c5b0d1ec
Modified Files:
sql/backends/monet5/sql_execute.c
sql/test/BugTracker-2020/Tests/All
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (192 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,4 +183,5 @@ if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
+
# vim: set ts=2:sw=2:et
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -686,7 +686,7 @@ SQLengineIntern(Client c, backend *be)
return MAL_SUCCEED;
}
- if (m->emode == m_prepare)
+ if (m->emode == m_deallocate || m->emode == m_prepare)
goto cleanup_engine;
be->language = 'D';
@@ -701,7 +701,7 @@ SQLengineIntern(Client c, backend *be)
msg = SQLrun(c,m);
cleanup_engine:
- if (m->emode != m_prepare && m->type == Q_SCHEMA && m->qc != NULL)
+ if (m->emode != m_deallocate && m->emode != m_prepare && m->type ==
Q_SCHEMA && m->qc != NULL)
qc_clean(m->qc);
if (msg) {
/* don't print exception decoration, just the message */
diff --git a/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out
b/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out
--- a/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out
+++ b/sql/jdbc/tests/Tests/Test_CallableStmt.stable.out
@@ -83,7 +83,7 @@ 6. nullable 2 (UNKNOWN)
scale 0
type 12
typename url
- classname nl.cwi.monetdb.jdbc.types.URL
+ classname org.monetdb.jdbc.types.URL
mode 1 (IN)
Table tbl6402 has 7 columns:
tint tdouble tbool tvarchar tclob turl tclen
diff --git a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
--- a/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Dobjects.stable.out
@@ -42,9 +42,9 @@ null tmp objects SYSTEM TABLE
null tmp triggers SYSTEM TABLE null null null null
null null
Resultset with 7 columns
TYPE_CAT TYPE_SCHEM TYPE_NAME CLASS_NAME DATA_TYPE
REMARKS BASE_TYPE
-null sys inet nl.cwi.monetdb.jdbc.types.INET 2000 inet null
+null sys inet org.monetdb.jdbc.types.INET 2000 inet null
null sys json java.lang.String 2000 json null
-null sys url nl.cwi.monetdb.jdbc.types.URL 2000 url null
+null sys url org.monetdb.jdbc.types.URL 2000 url null
null sys uuid java.lang.String 2000 uuid null
Resultset with 7 columns
TYPE_CAT TYPE_SCHEM TYPE_NAME CLASS_NAME DATA_TYPE
REMARKS BASE_TYPE
diff --git a/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out
b/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out
--- a/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_PSsqldata.stable.out
@@ -54,11 +54,11 @@ 1. 2 parameters: 2
1.
type 12
typename inet
- classname nl.cwi.monetdb.jdbc.types.INET
+ classname org.monetdb.jdbc.types.INET
2.
type 12
typename url
- classname nl.cwi.monetdb.jdbc.types.URL
+ classname org.monetdb.jdbc.types.URL
1. 172.5.5.5/24
172.5.5.5/24
/172.5.5.5
diff --git a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rmetadata.stable.out
@@ -138,7 +138,7 @@ 6. java.lang.Integer is an instance of j
6. java.lang.Double is an instance of java.lang.Double
6. java.lang.Boolean is an instance of java.lang.Boolean
6. java.lang.String is an instance of java.lang.String
-6. nl.cwi.monetdb.jdbc.MonetClob is an instance of java.sql.Clob
+6. org.monetdb.jdbc.MonetClob is an instance of java.sql.Clob
# 09:09:21 >
# 09:09:21 > Done.
diff --git a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
--- a/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
+++ b/sql/jdbc/tests/Tests/Test_Rsqldata.stable.out
@@ -52,12 +52,12 @@ stdout of test 'Test_Rsqldata` in direct
0. false false
0. 4 columns: 2
1. null
- classname nl.cwi.monetdb.jdbc.types.INET
+ classname org.monetdb.jdbc.types.INET
schemaname sys
tablename table_test_rsqldata
name myinet
2. null
- classname nl.cwi.monetdb.jdbc.types.URL
+ classname org.monetdb.jdbc.types.URL
schemaname sys
tablename table_test_rsqldata
name myurl
diff --git a/sql/test/BugTracker-2020/Tests/All
b/sql/test/BugTracker-2020/Tests/All
--- a/sql/test/BugTracker-2020/Tests/All
+++ b/sql/test/BugTracker-2020/Tests/All
@@ -30,3 +30,4 @@ KNOWNFAIL?wrong-key-error.Bug-6983
window-function-order.Bug-6997
semijoin.Bug-7001
drop-stream-table.Bug-7005
+deallocate-id.Bug-7010
diff --git a/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.sql
b/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.sql
@@ -0,0 +1,7 @@
+select count(*) from sys.prepared_statements;
+prepare select 1;
+prepare select 2;
+deallocate **;
+select count(*) from sys.prepared_statements;
+deallocate all;
+select count(*) from sys.prepared_statements;
diff --git a/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.err
b/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.err
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.err
@@ -0,0 +1,12 @@
+stderr of test 'deallocate-id.Bug-7010` in directory
'sql/test/BugTracker-2020` itself:
+
+
+# 10:44:37 >
+# 10:44:37 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-64069" "--port=37275"
+# 10:44:37 >
+
+
+# 10:44:37 >
+# 10:44:37 > "Done."
+# 10:44:37 >
+
diff --git a/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.out
b/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.out
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2020/Tests/deallocate-id.Bug-7010.stable.out
@@ -0,0 +1,46 @@
+stdout of test 'deallocate-id.Bug-7010` in directory
'sql/test/BugTracker-2020` itself:
+
+
+# 10:44:37 >
+# 10:44:37 > "mclient" "-lsql" "-ftest" "-tnone" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-64069" "--port=37275"
+# 10:44:37 >
+
+#select count(*) from sys.prepared_statements;
+% .%2 # table_name
+% %2 # name
+% bigint # type
+% 1 # length
+[ 0 ]
+#prepare select 1;
+#prepare select 1;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 7, 1, 1, 0, 2, 2 # length
+[ "tinyint", 1, 0, "", "%2", "%2" ]
+#prepare select 2;
+#prepare select 2;
+% .prepare, .prepare, .prepare, .prepare, .prepare,
.prepare # table_name
+% type, digits, scale, schema, table, column # name
+% varchar, int, int, str, str, str # type
+% 7, 1, 1, 0, 2, 2 # length
+[ "tinyint", 2, 0, "", "%2", "%2" ]
+#deallocate 1;
+#select count(*) from sys.prepared_statements;
+% .%2 # table_name
+% %2 # name
+% bigint # type
+% 1 # length
+[ 1 ]
+#deallocate all;
+#select count(*) from sys.prepared_statements;
+% .%2 # table_name
+% %2 # name
+% bigint # type
+% 1 # length
+[ 0 ]
+
+# 10:44:37 >
+# 10:44:37 > "Done."
+# 10:44:37 >
+
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
