Changeset: ad59d3c7157e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ad59d3c7157e
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/server/rel_schema.c
sql/storage/store.c
Branch: comment-on
Log Message:
Fix some 'mixed declarations and code' warnings
diffs (172 lines):
diff --git a/sql/backends/monet5/sql_upgrades.c
b/sql/backends/monet5/sql_upgrades.c
--- a/sql/backends/monet5/sql_upgrades.c
+++ b/sql/backends/monet5/sql_upgrades.c
@@ -804,14 +804,14 @@ sql_update_jul2017(Client c, mvc *sql)
static str
sql_create_comments_table(Client c)
{
- char *err;
+ char *err, *q1, *q2;
- char *q1 = "CREATE TABLE sys.comments (id INTEGER, remark CLOB);\n";
+ q1 = "CREATE TABLE sys.comments (id INTEGER, remark CLOB);\n";
err = SQLstatementIntern(c, &q1, "update", 1, 0, NULL);
if (err)
return err;
- char *q2 = "UPDATE sys._tables SET system = true WHERE name =
'comments' AND schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys');\n";
+ q2 = "UPDATE sys._tables SET system = true WHERE name = 'comments' AND
schema_id = (SELECT id FROM sys.schemas WHERE name = 'sys');\n";
return SQLstatementIntern(c, &q2, "update", 1, 0, NULL);
}
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -1935,9 +1935,11 @@ rel_commentable_object(mvc *sql, symbol
switch (catalog_object->token) {
case SQL_SCHEMA: {
+ char *sname;
+ sql_schema *s;
+
assert(catalog_object->type == type_string);
- char *sname = catalog_object->data.sval;
- sql_schema *s;
+ sname = catalog_object->data.sval;
if (!(s = mvc_bind_schema(sql, sname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
schema: %s", sname);
return 0;
@@ -1945,16 +1947,21 @@ rel_commentable_object(mvc *sql, symbol
return s->base.id;
}
case SQL_TABLE: {
+ dlist *qname;
+ sql_schema *s;
+ char *sname;
+ char *tname;
+ sql_table *t;
+
assert(catalog_object->type == type_list);
- dlist *qname = catalog_object->data.lval;
- sql_schema *s = cur_schema(sql);
- char *sname = qname_schema(qname);
+ qname = catalog_object->data.lval;
+ s = cur_schema(sql);
+ sname = qname_schema(qname);
if (sname && !(s = mvc_bind_schema(sql, sname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
schema: %s", sname);
return 0;
}
- char *tname = qname_table(qname);
- sql_table *t;
+ tname = qname_table(qname);
if (!(t = mvc_bind_table(sql, s, tname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
table: %s.%s", s->base.name, tname);
return 0;
@@ -1963,8 +1970,13 @@ rel_commentable_object(mvc *sql, symbol
}
case SQL_COLUMN: {
char *sname, *tname, *cname;
+ dlist *colname;
+ sql_schema *s;
+ sql_table *t;
+ sql_column *c;
+
assert(catalog_object->type == type_list);
- dlist *colname = catalog_object->data.lval;
+ colname = catalog_object->data.lval;
assert(colname->cnt == 2 || colname->cnt == 3);
assert(colname->h->type == type_string);
assert(colname->h->next->type == type_string);
@@ -1979,17 +1991,15 @@ rel_commentable_object(mvc *sql, symbol
assert(colname->h->next->next->type ==
type_string);
cname = colname->h->next->next->data.sval;
}
- sql_schema *s = cur_schema(sql);
+ s = cur_schema(sql);
if (sname && !(s = mvc_bind_schema(sql, sname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
schema: %s", sname);
return 0;
}
- sql_table *t;
if (!(t = mvc_bind_table(sql, s, tname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
table: %s.%s", s->base.name, tname);
return 0;
}
- sql_column *c;
if (!(c = mvc_bind_column(sql, t, cname))) {
sql_error(sql, 02, "3F000!COMMENT ON:no such
column: %s.%s", tname, cname);
return 0;
@@ -2199,11 +2209,14 @@ rel_schemas(mvc *sql, symbol *s)
case SQL_COMMENT:
{
dlist *l = s->data.lval;
- assert(l->cnt == 2);
symbol *catalog_object = l->h->data.sym;
- char *remark = l->h->next->data.sval;
+ char *remark;
+ sqlid id;
- sqlid id = rel_commentable_object(sql, catalog_object);
+ assert(l->cnt == 2);
+ remark = l->h->next->data.sval;
+
+ id = rel_commentable_object(sql, catalog_object);
if (!id) {
/* rel_commentable_object has already set the error
message so we don't have to */
return NULL;
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -5514,14 +5514,21 @@ sql_trans_end(sql_session *s)
void
sql_trans_comment(sql_trans *tr, int id, const char *remark) {
- sql_schema *sys = find_sql_schema(tr, "sys");
+ sql_schema *sys;
+ sql_table *comments;
+ sql_column *id_col;
+ oid row;
+
+ sys = find_sql_schema(tr, "sys");
assert(sys);
- sql_table *comments = find_sql_table(sys, "comments");
+
+ comments = find_sql_table(sys, "comments");
assert(comments);
- sql_column *id_col = find_sql_column(comments, "id");
+
+ id_col = find_sql_column(comments, "id");
assert(id_col);
- oid row = table_funcs.column_find_row(tr, id_col, &id, NULL);
+ row = table_funcs.column_find_row(tr, id_col, &id, NULL);
if (remark && strlen(remark) > 0) {
if (row == oid_nil) {
/* insert comment */
@@ -5542,14 +5549,21 @@ sql_trans_comment(sql_trans *tr, int id,
}
void sql_trans_drop_any_comment(sql_trans *tr, int id) {
- sql_schema *sys = find_sql_schema(tr, "sys");
+ sql_schema *sys;
+ sql_column *id_col;
+ sql_table *comments;
+ oid row;
+
+ sys = find_sql_schema(tr, "sys");
assert(sys);
- sql_table *comments = find_sql_table(sys, "comments");
+
+ comments = find_sql_table(sys, "comments");
assert(comments);
- sql_column *id_col = find_sql_column(comments, "id");
+
+ id_col = find_sql_column(comments, "id");
assert(id_col);
- oid row = table_funcs.column_find_row(tr, id_col, &id, NULL);
+ row = table_funcs.column_find_row(tr, id_col, &id, NULL);
if (row != oid_nil) {
table_funcs.table_delete(tr, comments, row);
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
