Changeset: 365dac4dd88e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/365dac4dd88e
Modified Files:
sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:
Merge with Mar2025 branch
diffs (35 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -1021,6 +1021,7 @@ backend_dumpstmt_body(backend *be, MalBl
InstrPtr q, querylog = NULL;
int old_mv = be->mvc_var;
MalBlkPtr old_mb = be->mb;
+ char *cq_query = NULL, *buf = NULL;
/* Always keep the SQL query around for monitoring */
if (query) {
@@ -1033,9 +1034,23 @@ backend_dumpstmt_body(backend *be, MalBl
return -1;
}
setVarType(mb, getArg(q, 0), TYPE_void);
+ if (r->flag == ddl_psm && r->exps
+ && exps_have_func(r->exps) && r->exps->cnt == 1) {
+ sql_func *f = r->exps->h->data;
+ cq *cq = qc_find(m->qc, f->base.id);
+ cq_query = cq ? cq->f->query : NULL;
+ if (cq_query) {
+ size_t buf_sz = strlen(query) +
strlen(cq_query);
+ buf = GDKmalloc(buf_sz);
+ snprintf(buf, buf_sz, "%.*s %s",
(int)strlen(query) - 1, query, cq_query);
+ query = buf;
+ }
+ }
q = pushStr(mb, q, query);
q = pushStr(mb, q, getSQLoptimizer(be->mvc));
pushInstruction(mb, q);
+ if (cq_query)
+ GDKfree(buf);
}
/* announce the transaction mode */
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
