Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv6989/src/backends/monet5
Modified Files:
sql.mx
Log Message:
propagated changes of Friday Mar 16 2007 - Thursday Mar 22 2007
from the SQL_2-16 branch to the development trunk
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- sql.mx 21 Mar 2007 21:39:41 -0000 1.216
+++ sql.mx 22 Mar 2007 09:26:53 -0000 1.217
@@ -93,15 +93,15 @@
address getVariable
comment "Get the value of a session variable";
-command next_value( sequence:str ):lng
+command next_value( sname:str, sequence:str ):lng
address mvc_next_value
comment "return the next value of the sequence";
-command get_value( sequence:str ):lng
+command get_value( sname:str, sequence:str ):lng
address mvc_get_value
comment "return the current value of the sequence";
-command restart( sequence:str, start:lng ):lng
+command restart( sname:str, sequence:str, start:lng ):lng
address mvc_restart_seq
comment "restart the sequence with value start";
@@ -590,9 +590,9 @@
sql5_export str setVariable(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
sql5_export str getVariable(MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
sql5_export str sql_variables(int *res);
-sql5_export str mvc_next_value(lng *res, str *seqname);
-sql5_export str mvc_get_value(lng *res, str *seqname);
-sql5_export str mvc_restart_seq(lng *res, str *seqname, lng *start);
+sql5_export str mvc_next_value(lng *res, str *sname, str *seqname);
+sql5_export str mvc_get_value(lng *res, str *sname, str *seqname);
+sql5_export str mvc_restart_seq(lng *res, str *sname, str *seqname, lng
*start);
sql5_export str mvc_affected_rows_int(int *r, int *nr, str *w);
sql5_export str zero_or_one(ptr ret, int *bid);
sql5_export str not_unique(bit *ret, int *bid);
@@ -941,7 +941,7 @@
}
str
-mvc_next_value(lng *res, str *seqname)
+mvc_next_value(lng *res, str *sname, str *seqname)
{
mvc *m = NULL;
str msg = getContext(&m, NULL);
@@ -949,7 +949,7 @@
if (msg)
return msg;
- s = m->session->schema;
+ s = mvc_bind_schema(m, *sname);
if (s) {
sql_sequence *seq = find_sql_sequence(s, *seqname);
@@ -960,7 +960,7 @@
}
str
-mvc_get_value(lng *res, str *seqname)
+mvc_get_value(lng *res, str *sname, str *seqname)
{
mvc *m = NULL;
str msg = getContext(&m, NULL);
@@ -968,7 +968,7 @@
if (msg)
return msg;
- s = m->session->schema;
+ s = mvc_bind_schema(m, *sname);
if (s) {
sql_sequence *seq = find_sql_sequence(s, *seqname);
@@ -979,7 +979,7 @@
}
str
-mvc_restart_seq(lng *res, str *seqname, lng *start)
+mvc_restart_seq(lng *res, str *sname, str *seqname, lng *start)
{
mvc *m = NULL;
str msg = getContext(&m, NULL);
@@ -987,7 +987,7 @@
if (msg)
return msg;
- s = m->session->schema;
+ s = mvc_bind_schema(m, *sname);
if (s) {
sql_sequence *seq = find_sql_sequence(s, *seqname);
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins
