MonetDB: clean_parser - No hge upgrade approvals.
Changeset: a869dc71439c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a869dc71439c
Modified Files:
sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-previous-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: clean_parser
Log Message:
No hge upgrade approvals.
diffs (136 lines):
diff --git a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade-chain/Tests/upgrade.stable.out
@@ -755,6 +755,13 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
update sys._tables set system = true where not system and schema_id = (select
id from sys.schemas where name = 'information_schema') and name = 'parameters';
Running database upgrade commands:
+create function dayname(d date) returns varchar(10) return date_to_str(d,
'%A');
+create function monthname(d date) returns varchar(10) return date_to_str(d,
'%B');
+grant execute on function dayname(date) to public;
+grant execute on function monthname(date) to public;
+update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
+
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
diff --git a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
--- a/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/emptydb-previous-upgrade/Tests/upgrade.stable.out
@@ -755,6 +755,13 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
update sys._tables set system = true where not system and schema_id = (select
id from sys.schemas where name = 'information_schema') and name = 'parameters';
Running database upgrade commands:
+create function dayname(d date) returns varchar(10) return date_to_str(d,
'%A');
+create function monthname(d date) returns varchar(10) return date_to_str(d,
'%B');
+grant execute on function dayname(date) to public;
+grant execute on function monthname(date) to public;
+update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
+
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -266,6 +266,13 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
update sys._tables set system = true where not system and schema_id = (select
id from sys.schemas where name = 'information_schema') and name = 'parameters';
Running database upgrade commands:
+create function dayname(d date) returns varchar(10) return date_to_str(d,
'%A');
+create function monthname(d date) returns varchar(10) return date_to_str(d,
'%B');
+grant execute on function dayname(date) to public;
+grant execute on function monthname(date) to public;
+update sys.functions set system = true where system <> true and name in
('dayname', 'monthname') and schema_id = 2000 and type = (select
function_type_id from sys.function_types where function_type_name = 'Scalar
function');
+
+Running database upgrade commands:
drop view sys.geometry_columns;
create view sys.geometry_columns as
select cast(null as varchar(1)) as f_table_catalog,
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
@@ -266,6 +266,13 @@ GRANT SELECT ON TABLE INFORMATION_SCHEMA
update sys._tables set system = true where not system and schema_id = (select
id from sys.schemas where name = 'information_schema') and name = 'parameters';
Running database upgrade commands:
+create function dayname(d date) returns varchar(10) return date_to_str(d,
'%A');
+create function monthname(d date) returns varchar(10) return date_to_str(d,
'%B');
+grant execute on function dayname(date) to public;
MonetDB: odbc_loader - correcting indentation
Changeset: a5d791eab549 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a5d791eab549
Modified Files:
sql/backends/monet5/vaults/monetdb/monetdb.c
Branch: odbc_loader
Log Message:
correcting indentation
diffs (49 lines):
diff --git a/sql/backends/monet5/vaults/monetdb/monetdb.c
b/sql/backends/monet5/vaults/monetdb/monetdb.c
--- a/sql/backends/monet5/vaults/monetdb/monetdb.c
+++ b/sql/backends/monet5/vaults/monetdb/monetdb.c
@@ -55,19 +55,18 @@ monetdb_relation(mvc *sql, sql_subfunc *
return sa_message(sql->sa, "monetdb_loader" "uri invalid
'%s'\n", uri);
tname = strrchr(uric, '/');
-
if (tname) {
tname[0] = 0;
sname = strrchr(uric, '/');
}
if (!sname)
return sa_message(sql->sa, "monetdb_loader" "schema and/or
table missing in '%s'\n", uri);
+
sname[0] = 0; /* stripped the schema/table name */
sname++;
tname++;
char buf[256];
-
- const char *query = "select c.name, c.type, c.type_digits, c.type_scale
from sys.schemas s, sys._tables t, sys._columns c where s.name = '%s' and s.id
= t.schema_id and t.name = '%s' and t.id = c.table_id order by number;";
+ const char *query = "select c.name, c.type, c.type_digits, c.type_scale
from sys.schemas s, sys._tables t, sys._columns c where s.name = '%s' and s.id
= t.schema_id and t.name = '%s' and t.id = c.table_id order by c.number;";
if (snprintf(buf, 256, query, sname, tname) < 0)
return RUNTIME_LOAD_ERROR;
@@ -153,15 +152,15 @@ monetdb_load(void *BE, sql_subfunc *f, c
return NULL;
t->query = uri; /* set uri */
node *n, *nn = f->colnames->h, *tn = f->coltypes->h;
-for (n = f->res->h; n; n = n->next, nn = nn->next, tn = tn->next) {
-const char *name = nn->data;
-sql_subtype *tp = tn->data;
-sql_column *c = NULL;
+ for (n = f->res->h; n; n = n->next, nn = nn->next, tn = tn->next) {
+ const char *name = nn->data;
+ sql_subtype *tp = tn->data;
+ sql_column *c = NULL;
-if (!tp || mvc_create_column(&c, be->mvc, t, name, tp) != LOG_OK) {
-return NULL;
-}
-}
+ if (!tp || mvc_create_column(&c, be->mvc, t, name, tp) !=
LOG_OK) {
+ return NULL;
+ }
+ }
sql_rel *rel = NULL;
rel = rel_basetable(sql, t, f->tname);
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Aug2024 - Reinitialize the whole variable struct.
Changeset: 65d950312ade for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/65d950312ade
Modified Files:
monetdb5/mal/mal_instruction.c
Branch: Aug2024
Log Message:
Reinitialize the whole variable struct.
This avoids a potential crash when using the stethoscope.
diffs (14 lines):
diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -611,7 +611,9 @@ newVariable(MalBlkPtr mb, const char *na
return -1;
}
n = mb->vtop;
- mb->var[n].name = NULL;
+ mb->var[n] = (VarRecord) {
+ .name = NULL,
+ };
if (name && len > 0) {
char *nme = GDKmalloc(len+1);
if (!nme) {
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Aug2024 - Add test for issue #7605
Changeset: 1003539e5c2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1003539e5c2c
Added Files:
sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
Modified Files:
sql/test/BugTracker-2024/Tests/All
Branch: Aug2024
Log Message:
Add test for issue #7605
diffs (51 lines):
diff --git a/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
b/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
@@ -0,0 +1,37 @@
+statement ok
+create schema test
+
+statement ok
+create table test.mytable (name clob, id clob)
+
+statement ok
+insert into test.mytable values('my', '1')
+
+statement ok
+insert into test.mytable values('my', '2')
+
+-- 42000!SELECT: cannot use non GROUP BY column 'mytable.name' in query
results without an aggregate function
+skipif knownfail
+query TI nosort
+select test.mytable.name, count(*)
+from test.mytable
+group by test.mytable.name
+order by test.mytable.name
+
+my
+2
+
+query TI nosort
+select x.name, count(*)
+from test.mytable as x
+group by x.name
+order by x.name
+
+my
+2
+
+statement ok
+drop table test.mytable
+
+statement ok
+drop schema test
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,4 +99,5 @@ KNOWNFAIL?7598-foreign_key_match_options
KNOWNFAIL?7598-foreign_key_match_options_dump
7602-copy-into-multiple-files
7603-copy-into-3files-crash
+7605_full_3_level_name_support
7607-alter-add-serial
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: default - merge Aug2024
Changeset: 4fc6e7325339 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4fc6e7325339
Branch: default
Log Message:
merge Aug2024
diffs (81 lines):
diff --git a/buildtools/conf/monetdbd.conf.in b/buildtools/conf/monetdbd.conf.in
--- a/buildtools/conf/monetdbd.conf.in
+++ b/buildtools/conf/monetdbd.conf.in
@@ -1,3 +1,6 @@
# this file is for systemd
# monetdbd needs a directory in /run that is owned by monetdb:monetdb
d @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb 0775 monetdb monetdb -
+# do not touch our socket files
+x /tmp/.s.monetdb.*
+x /tmp/.s.merovingian.*
diff --git a/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
b/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
@@ -0,0 +1,37 @@
+statement ok
+create schema test
+
+statement ok
+create table test.mytable (name clob, id clob)
+
+statement ok
+insert into test.mytable values('my', '1')
+
+statement ok
+insert into test.mytable values('my', '2')
+
+-- 42000!SELECT: cannot use non GROUP BY column 'mytable.name' in query
results without an aggregate function
+skipif knownfail
+query TI nosort
+select test.mytable.name, count(*)
+from test.mytable
+group by test.mytable.name
+order by test.mytable.name
+
+my
+2
+
+query TI nosort
+select x.name, count(*)
+from test.mytable as x
+group by x.name
+order by x.name
+
+my
+2
+
+statement ok
+drop table test.mytable
+
+statement ok
+drop schema test
diff --git a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
--- a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
+++ b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
@@ -18,3 +18,15 @@ alter table t add column d serial;
statement ok
create table tb(a int, b int auto_increment)
+
+statement ok
+drop table tb
+
+statement ok
+drop table t
+
+statement ok
+set schema sys
+
+statement ok
+drop schema s7607
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,4 +99,5 @@ 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
+7605_full_3_level_name_support
+7607-alter-add-serial
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: odbc_loader - merge default
Changeset: cef6fa944dd7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/cef6fa944dd7
Branch: odbc_loader
Log Message:
merge default
diffs (81 lines):
diff --git a/buildtools/conf/monetdbd.conf.in b/buildtools/conf/monetdbd.conf.in
--- a/buildtools/conf/monetdbd.conf.in
+++ b/buildtools/conf/monetdbd.conf.in
@@ -1,3 +1,6 @@
# this file is for systemd
# monetdbd needs a directory in /run that is owned by monetdb:monetdb
d @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb 0775 monetdb monetdb -
+# do not touch our socket files
+x /tmp/.s.monetdb.*
+x /tmp/.s.merovingian.*
diff --git a/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
b/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7605_full_3_level_name_support.test
@@ -0,0 +1,37 @@
+statement ok
+create schema test
+
+statement ok
+create table test.mytable (name clob, id clob)
+
+statement ok
+insert into test.mytable values('my', '1')
+
+statement ok
+insert into test.mytable values('my', '2')
+
+-- 42000!SELECT: cannot use non GROUP BY column 'mytable.name' in query
results without an aggregate function
+skipif knownfail
+query TI nosort
+select test.mytable.name, count(*)
+from test.mytable
+group by test.mytable.name
+order by test.mytable.name
+
+my
+2
+
+query TI nosort
+select x.name, count(*)
+from test.mytable as x
+group by x.name
+order by x.name
+
+my
+2
+
+statement ok
+drop table test.mytable
+
+statement ok
+drop schema test
diff --git a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
--- a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
+++ b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test
@@ -18,3 +18,15 @@ alter table t add column d serial;
statement ok
create table tb(a int, b int auto_increment)
+
+statement ok
+drop table tb
+
+statement ok
+drop table t
+
+statement ok
+set schema sys
+
+statement ok
+drop schema s7607
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,4 +99,5 @@ 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
+7605_full_3_level_name_support
+7607-alter-add-serial
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
MonetDB: Aug2024 - Correcting test name in All file. Also add so...
Changeset: 0d370641c3ab for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/0d370641c3ab Modified Files: sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test sql/test/BugTracker-2024/Tests/All Branch: Aug2024 Log Message: Correcting test name in All file. Also add some cleanup statements to the test. diffs (28 lines): diff --git a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test --- a/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test +++ b/sql/test/BugTracker-2024/Tests/7607-alter-add-serial.test @@ -18,3 +18,15 @@ alter table t add column d serial; statement ok create table tb(a int, b int auto_increment) + +statement ok +drop table tb + +statement ok +drop table t + +statement ok +set schema sys + +statement ok +drop schema s7607 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,4 +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 +7607-alter-add-serial ___ checkin-list mailing list -- checkin-list@monetdb.org To unsubscribe send an email to checkin-list-le...@monetdb.org
