Changeset: c1c570f6aa0c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c1c570f6aa0c
Modified Files:
sql/backends/monet5/rel_bin.c
sql/include/sql_catalog.h
sql/server/rel_sequence.c
sql/server/sql_parser.y
sql/storage/store.c
Branch: default
Log Message:
Partial backout of 8375f4878745.
diffs (78 lines):
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4823,7 +4823,7 @@ sql_truncate(backend *be, sql_table *t,
mvc *sql = be->mvc;
list *l = sa_list(sql->sa);
stmt *v, *ret = NULL, *other = NULL;
- const char *next_value_for = "next value for \"sys\".\"seq"
SQL_INTERNAL_SEPERATOR;
+ const char *next_value_for = "next value for \"sys\".\"seq_";
char *seq_name = NULL;
str seq_pos = NULL;
sql_column *col = NULL;
@@ -4855,7 +4855,7 @@ sql_truncate(backend *be, sql_table *t,
for (n = next->columns.set->h; n; n = n->next) {
col = n->data;
if (col->def && (seq_pos = strstr(col->def,
next_value_for))) {
- seq_name = _STRDUP(seq_pos +
(strlen(next_value_for) - strlen("seq" SQL_INTERNAL_SEPERATOR)));
+ seq_name = _STRDUP(seq_pos +
(strlen(next_value_for) - strlen("seq_")));
if(!seq_name) {
sql_error(sql, 02,
SQLSTATE(HY001) MAL_MALLOC_FAIL);
error = 1;
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -521,8 +521,6 @@ typedef enum table_types {
#define TABLE_READONLY 1
#define TABLE_APPENDONLY 2
-#define SQL_INTERNAL_SEPERATOR "\037"
-
typedef struct sql_part_value {
sql_subtype tpe;
ptr value;
diff --git a/sql/server/rel_sequence.c b/sql/server/rel_sequence.c
--- a/sql/server/rel_sequence.c
+++ b/sql/server/rel_sequence.c
@@ -20,7 +20,7 @@ sql_next_seq_name(mvc *m)
size_t len = 5 + 10; /* max nr of digits of (4 bytes) int is 10 */
char *msg = sa_alloc(m->sa, len);
- snprintf(msg, len, "seq" SQL_INTERNAL_SEPERATOR "%d", id);
+ snprintf(msg, len, "seq_%d", id);
return msg;
}
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -1808,7 +1808,7 @@ generated_column:
sql_find_subtype(&it, "int", 32, 0);
append_symbol(o, _symbol_create_list(SQL_TYPE,
append_type(L(),&it)));
append_list(l, o);
- append_int(l, 1); /* to be dropped */
+ append_int(l, 0); /* to be dropped */
if (m->scanner.schema)
append_string(seqn2, m->scanner.schema);
append_string(seqn2, sn);
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -4336,7 +4336,7 @@ static void
sys_drop_column(sql_trans *tr, sql_column *col, int drop_action)
{
str seq_pos = NULL;
- const char *next_value_for = "next value for \"sys\".\"seq"
SQL_INTERNAL_SEPERATOR;
+ const char *next_value_for = "next value for \"sys\".\"seq_";
sql_schema *syss = find_sql_schema(tr, isGlobal(col->t)?"sys":"tmp");
sql_table *syscolumn = find_sql_table(syss, "_columns");
oid rid = table_funcs.column_find_row(tr, find_sql_column(syscolumn,
"id"),
@@ -4350,7 +4350,7 @@ sys_drop_column(sql_trans *tr, sql_colum
if (col->def && (seq_pos = strstr(col->def, next_value_for))) {
sql_sequence * seq = NULL;
- char *seq_name = _STRDUP(seq_pos + (strlen(next_value_for) -
strlen("seq" SQL_INTERNAL_SEPERATOR)));
+ char *seq_name = _STRDUP(seq_pos + (strlen(next_value_for) -
strlen("seq_")));
node *n = NULL;
seq_name[strlen(seq_name)-1] = '\0';
n = cs_find_name(&syss->seqs, seq_name);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
