Changeset: 633ec31ae751 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=633ec31ae751
Modified Files:
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_execute.h
Branch: pyapi
Log Message:
Revert rev ea33fe35a14c (read-only statements in loopback queries).
diffs (68 lines):
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
@@ -43,13 +43,6 @@
/* #define _SQL_COMPILE */
-
-str
-SQLstatementIntern(Client c, str *expr, str nme, int execute, bit output,
res_table **result)
-{
- return SQLstatementIntern_wrapped(c, expr, nme, execute, output, 0, 0,
result);
-}
-
/*
* BEWARE: SQLstatementIntern only commits after all statements found
* in expr are executed, when autocommit mode is enabled.
@@ -58,7 +51,7 @@ SQLstatementIntern(Client c, str *expr,
* is executed within the client context specified. This leads to context
juggling.
*/
str
-SQLstatementIntern_wrapped(Client c, str *expr, str nme, int execute, bit
output, bit readonly, bit singlestatement, res_table **result)
+SQLstatementIntern(Client c, str *expr, str nme, int execute, bit output,
res_table **result)
{
int status = 0;
int err = 0;
@@ -162,21 +155,6 @@ SQLstatementIntern_wrapped(Client c, str
c->glb = oldglb;
goto endofcompile;
}
- if (readonly) {
- switch (m->sym->token) {
- case SQL_SELECT:
- case SQL_JOIN:
- case SQL_CROSS:
- case SQL_UNION:
- case SQL_EXCEPT:
- case SQL_INTERSECT:
- break;
- default:
- msg = createException(PARSE,
"SQLparser", "Mode set to readonly, but received token %d", m->sym->token);
- sqlcleanup(m, err);
- goto endofcompile;
- }
- }
/*
* We have dealt with the first parsing step and advanced the
input reader
* to the next statement (if any).
@@ -246,8 +224,6 @@ SQLstatementIntern_wrapped(Client c, str
#endif
assert(c->glb == 0 || c->glb == oldglb); /* detect leak
*/
c->glb = oldglb;
-
- if (singlestatement) break;
}
if (m->results && result) { /* return all results sets */
*result = m->results;
diff --git a/sql/backends/monet5/sql_execute.h
b/sql/backends/monet5/sql_execute.h
--- a/sql/backends/monet5/sql_execute.h
+++ b/sql/backends/monet5/sql_execute.h
@@ -11,7 +11,6 @@
#include "sql.h"
sql5_export str SQLstatementREST(Client c, MalBlkPtr mb, MalStkPtr stk,
InstrPtr pci);
-sql5_export str SQLstatementIntern_wrapped(Client c, str *expr, str nme, int
execute, bit output, bit readonly, bit singlestatement, res_table **result);
sql5_export str SQLstatementIntern(Client c, str *expr, str nme, int execute,
bit output, res_table **result);
sql5_export str SQLexecutePrepared(Client c, backend *be, cq *q);
sql5_export str SQLengineIntern(Client c, backend *be);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
