Changeset: 0c9743404c63 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0c9743404c63
Modified Files:
sql/backends/monet5/sql_upgrades.c
sql/server/sql_mvc.c
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out.powerpc64.int128
Branch: default
Log Message:
Increase maximum length of query column in sys.tables to 1 MiB.
See changeset 759bcf8796d8.
diffs (truncated from 464 to 300 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
@@ -1762,6 +1762,13 @@ sql_update_default(Client c, mvc *sql)
"create view sys.systemfunctions as select id as
function_id from sys.functions where system;\n"
"grant select on sys.systemfunctions to public;\n"
"update sys._tables set system = true where name =
'systemfunctions' and schema_id = (select id from sys.schemas where name =
'sys');\n");
+ /* update type of "query" attribute of tables sys._tables and
+ * tmp_tables from varchar(2048) to varchar(1048576) */
+ pos += snprintf(buf + pos, bufsize - pos,
+ "update sys._columns set type_digits = 1048576 where
name = 'query' and table_id in (select id from sys._tables t where t.name =
'_tables' and t.schema_id in (select id from sys.schemas s where s.name in
('sys', 'tmp')));\n");
+ pos += snprintf(buf + pos, bufsize - pos,
+ "update sys._columns set type_digits = 1048576 where
name = 'query' and table_id in (select id from sys._tables t where t.name =
'tables' and t.schema_id in (select id from sys.schemas s where s.name =
'sys'));\n");
+
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
@@ -1870,7 +1877,7 @@ sql_update_aug2018_sp2(Client c, mvc *sq
}
static str
-sql_upgrade_default(Client c, mvc *sql)
+sql_update_storagemodel(Client c, mvc *sql)
{
size_t bufsize = 20000, pos = 0;
char *buf, *err;
@@ -1879,7 +1886,7 @@ sql_upgrade_default(Client c, mvc *sql)
sql_table *t;
if ((buf = GDKmalloc(bufsize)) == NULL)
- throw(SQL, "sql_upgrade_default", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
+ throw(SQL, "sql_update_storagemodel", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
schema = stack_get_string(sql, "current_schema");
@@ -2179,11 +2186,6 @@ sql_upgrade_default(Client c, mvc *sql)
"update sys.functions set system = true where schema_id =
(select id from sys.schemas where name = 'sys')"
" and name in ('columnsize', 'heapsize', 'hashsize',
'imprintsize') and type = %d;\n", F_FUNC);
- /* update type of "query" attribute of tables sys._tables and
- * tmp_tables from varchar(2048) to varchar(1048576) */
- pos += snprintf(buf + pos, bufsize - pos,
- "update sys._columns set type_digits = 1048576 where
name = 'query' and table_id in (select id from sys._tables t where t.name =
'_tables' and t.schema_id in (select id from sys.schemas s where s.name in
('sys', 'tmp')));\n");
-
if (schema)
pos += snprintf(buf + pos, bufsize - pos, "set schema
\"%s\";\n", schema);
pos += snprintf(buf + pos, bufsize - pos, "commit;\n");
@@ -2413,7 +2415,7 @@ SQLupgrades(Client c, mvc *m)
if (sql_bind_func(m->sa, s, "storagemodel", NULL, NULL, F_UNION)
&& (t = mvc_bind_table(m, s, "tablestorage")) == NULL
&& (t = mvc_bind_table(m, s, "schemastorage")) == NULL ) {
- if ((err = sql_upgrade_default(c, m)) != NULL) {
+ if ((err = sql_update_storagemodel(c, m)) != NULL) {
fprintf(stderr, "!%s\n", err);
freeException(err);
}
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -120,7 +120,7 @@ mvc_init(int debug, store_type store, in
mvc_create_column_(m, t, "id", "int", 32);
mvc_create_column_(m, t, "name", "varchar", 1024);
mvc_create_column_(m, t, "schema_id", "int", 32);
- mvc_create_column_(m, t, "query", "varchar", 2048);
+ mvc_create_column_(m, t, "query", "varchar", 1 << 20);
mvc_create_column_(m, t, "type", "smallint", 16);
mvc_create_column_(m, t, "system", "boolean", 1);
mvc_create_column_(m, t, "commit_action", "smallint", 16);
diff --git a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -308,7 +310,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -304,7 +306,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -304,7 +306,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
@@ -5877,6 +5877,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -6161,7 +6163,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git
a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
--- a/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
+++ b/sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
@@ -5877,6 +5877,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -6161,7 +6163,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -308,7 +310,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -308,7 +310,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -308,7 +310,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
--- a/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
+++ b/sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
@@ -5877,6 +5877,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -6161,7 +6163,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
-update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
set schema "sys";
commit;
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -2013,7 +2013,7 @@ drop function pcre_replace(string, strin
[ "tables", "id", "int", 32, 0, NULL, true, 0, NULL
]
[ "tables", "name", "varchar", 1024, 0, NULL, true, 1,
NULL ]
[ "tables", "schema_id", "int", 32, 0, NULL, true, 2,
NULL ]
-[ "tables", "query", "varchar", 2048, 0, NULL, true,
3, NULL ]
+[ "tables", "query", "varchar", 1048576, 0, NULL,
true, 3, NULL ]
[ "tables", "type", "smallint", 16, 0, NULL, true, 4,
NULL ]
[ "tables", "system", "boolean", 1, 0, NULL, true,
5, NULL ]
[ "tables", "commit_action", "smallint", 16, 0, NULL,
true, 6, NULL ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.32bit
b/sql/test/emptydb/Tests/check.stable.out.32bit
--- a/sql/test/emptydb/Tests/check.stable.out.32bit
+++ b/sql/test/emptydb/Tests/check.stable.out.32bit
@@ -2013,7 +2013,7 @@ drop function pcre_replace(string, strin
[ "tables", "id", "int", 32, 0, NULL, true, 0, NULL
]
[ "tables", "name", "varchar", 1024, 0, NULL, true, 1,
NULL ]
[ "tables", "schema_id", "int", 32, 0, NULL, true, 2,
NULL ]
-[ "tables", "query", "varchar", 2048, 0, NULL, true,
3, NULL ]
+[ "tables", "query", "varchar", 1048576, 0, NULL,
true, 3, NULL ]
[ "tables", "type", "smallint", 16, 0, NULL, true, 4,
NULL ]
[ "tables", "system", "boolean", 1, 0, NULL, true,
5, NULL ]
[ "tables", "commit_action", "smallint", 16, 0, NULL,
true, 6, NULL ]
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -2023,7 +2023,7 @@ drop function pcre_replace(string, strin
[ "tables", "id", "int", 32, 0, NULL, true, 0, NULL
]
[ "tables", "name", "varchar", 1024, 0, NULL, true, 1,
NULL ]
[ "tables", "schema_id", "int", 32, 0, NULL, true, 2,
NULL ]
-[ "tables", "query", "varchar", 2048, 0, NULL, true,
3, NULL ]
+[ "tables", "query", "varchar", 1048576, 0, NULL,
true, 3, NULL ]
[ "tables", "type", "smallint", 16, 0, NULL, true, 4,
NULL ]
[ "tables", "system", "boolean", 1, 0, NULL, true,
5, NULL ]
[ "tables", "commit_action", "smallint", 16, 0, NULL,
true, 6, NULL ]
diff --git a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
--- a/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
+++ b/sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
@@ -24,6 +24,8 @@ drop table sys.systemfunctions;
create view sys.systemfunctions as select id as function_id from sys.functions
where system;
grant select on sys.systemfunctions to public;
update sys._tables set system = true where name = 'systemfunctions' and
schema_id = (select id from sys.schemas where name = 'sys');
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = '_tables' and
t.schema_id in (select id from sys.schemas s where s.name in ('sys', 'tmp')));
+update sys._columns set type_digits = 1048576 where name = 'query' and
table_id in (select id from sys._tables t where t.name = 'tables' and
t.schema_id in (select id from sys.schemas s where s.name = 'sys'));
set schema "sys";
commit;
@@ -308,7 +310,6 @@ update sys._tables set system = true whe
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storage') and type = 5;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('storagemodelinit') and type = 2;
update sys.functions set system = true where schema_id = (select id from
sys.schemas where name = 'sys') and name in ('columnsize', 'heapsize',
'hashsize', 'imprintsize') and type = 1;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
