Changeset: 5e7176eb2b9a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5e7176eb2b9a
Modified Files:
sql/server/rel_select.c
Branch: default
Log Message:
Merge with Aug2024 branch.
diffs (72 lines):
diff --git a/clients/examples/C/streamcat.c b/clients/examples/C/streamcat.c
--- a/clients/examples/C/streamcat.c
+++ b/clients/examples/C/streamcat.c
@@ -624,11 +624,10 @@ int cmd_bstream(char *argv[])
}
}
- mnstr_destroy(bs);
if (additional) {
mnstr_printf(s, "%s", additional);
}
- mnstr_close(s);
+ close_stream(bs); /* this also closes and
destroys s */
return 0;
}
diff --git a/sql/server/rel_select.c b/sql/server/rel_select.c
--- a/sql/server/rel_select.c
+++ b/sql/server/rel_select.c
@@ -4082,6 +4082,8 @@ rel_next_value_for( mvc *sql, symbol *se
sql_subtype t;
sql_subfunc *f;
+ if (!sname)
+ sname = "sys";
if (!stack_find_rel_view(sql, seqname)) {
if (!(seq = find_sequence_on_scope(sql, sname, seqname, "NEXT
VALUE FOR")))
return NULL;
@@ -4091,8 +4093,8 @@ rel_next_value_for( mvc *sql, symbol *se
sql_find_subtype(&t, "varchar", 0, 0);
f = sql_bind_func(sql, "sys", "next_value_for", &t, &t, F_FUNC, true,
true);
assert(f);
- /* sequence found in the stack. use session's schema? */
- return exp_binop(sql->sa, exp_atom_str(sql->sa, seq && seq->s ?
seq->s->base.name : "sys", &t), exp_atom_str(sql->sa, seqname, &t), f);
+ /* sequence found in the stack, ie just created. use given schema? */
+ return exp_binop(sql->sa, exp_atom_str(sql->sa, seq && seq->s ?
seq->s->base.name : sname, &t), exp_atom_str(sql->sa, seqname, &t), f);
}
/* some users like to use aliases already in the groupby */
diff --git a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
@@ -0,0 +1,20 @@
+statement ok
+create schema s7607
+
+statement ok
+set schema s7607
+
+statement ok
+create table t(a int)
+
+statement ok
+alter table t add column b int
+
+statement ok
+alter table t add column c int auto_increment
+
+statement ok
+alter table t add column d serial;
+
+statement ok
+create table tb(a int, b int auto_increment)
diff --git a/sql/test/BugTracker-2024/Tests/All
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -99,3 +99,4 @@ KNOWNFAIL?7598-foreign_key_match_options
KNOWNFAIL?7598-foreign_key_match_options_dump
7602-copy-into-multiple-files
7603-copy-into-3files-crash
+7607-alter-add-serial.test
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
