Changeset: af0414795fdf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af0414795fdf
Added Files:
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.sql
Modified Files:
clients/R/Tests/deps-install.R
clients/R/Tests/install.R
sql/backends/monet5/sql_user.c
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_select.c
sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Tests/marcin3.stable.err
Branch: default
Log Message:
Merge with Jul2017 branch.
diffs (truncated from 741 to 300 lines):
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -1,4 +1,5 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
+options(warn = -1)
packages_required <- c("digest", "DBI")
cat("#~BeginProfilingOutput~#\n", file=stderr())
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -1,3 +1,4 @@
+options(warn = -1)
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -512,6 +512,7 @@ monet5_user_set_def_schema(mvc *m, oid u
if (!schema || !mvc_set_schema(m, schema)) {
if (m->session->active)
mvc_rollback(m, 0, NULL);
+ GDKfree(username);
return NULL;
}
/* reset the user and schema names */
diff --git a/sql/scripts/51_sys_schema_extension.sql
b/sql/scripts/51_sys_schema_extension.sql
--- a/sql/scripts/51_sys_schema_extension.sql
+++ b/sql/scripts/51_sys_schema_extension.sql
@@ -10,28 +10,224 @@ CREATE TABLE sys.keywords (
keyword VARCHAR(40) NOT NULL PRIMARY KEY);
INSERT INTO sys.keywords (keyword) VALUES
-('ADD'), ('ADMIN'), ('AFTER'), ('AGGREGATE'), ('ALL'), ('ALTER'), ('ALWAYS'),
('AND'), ('ANY'), ('ASC'), ('ASYMMETRIC'), ('ATOMIC'), ('AUTO_INCREMENT'),
-('BEFORE'), ('BEGIN'), ('BEST'), ('BETWEEN'), ('BIGINT'), ('BIGSERIAL'),
('BINARY'), ('BLOB'), ('BY'),
-('CALL'), ('CASCADE'), ('CASE'), ('CAST'), ('CHAIN'), ('CHAR'), ('CHARACTER'),
('CHECK'), ('CLOB'), ('COALESCE'), ('COMMIT'), ('COMMITTED'), ('CONSTRAINT'),
('CONVERT'), ('COPY'), ('CORRESPONDING'), ('CREATE'), ('CROSS'), ('CURRENT'),
('CURRENT_DATE'), ('CURRENT_ROLE'), ('CURRENT_TIME'), ('CURRENT_TIMESTAMP'),
('CURRENT_USER'),
-('DAY'), ('DEC'), ('DECIMAL'), ('DECLARE'), ('DEFAULT'), ('DELETE'),
('DELIMITERS'), ('DESC'), ('DO'), ('DOUBLE'), ('DROP'),
-('EACH'), ('EFFORT'), ('ELSE'), ('ELSEIF'), ('ENCRYPTED'), ('END'),
('ESCAPE'), ('EVERY'), ('EXCEPT'), ('EXCLUDE'), ('EXISTS'), ('EXTERNAL'),
('EXTRACT'),
-('FALSE'), ('FLOAT'), ('FOLLOWING'), ('FOR'), ('FOREIGN'), ('FROM'), ('FULL'),
('FUNCTION'),
-('GENERATED'), ('GLOBAL'), ('GRANT'), ('GROUP'),
-('HAVING'), ('HOUR'), ('HUGEINT'),
-('IDENTITY'), ('IF'), ('ILIKE'), ('IN'), ('INDEX'), ('INNER'), ('INSERT'),
('INT'), ('INTEGER'), ('INTERSECT'), ('INTO'), ('IS'), ('ISOLATION'),
-('JOIN'),
-('LEFT'), ('LIKE'), ('LIMIT'), ('LOCAL'), ('LOCALTIME'), ('LOCALTIMESTAMP'),
('LOCKED'),
-('MEDIUMINT'), ('MERGE'), ('MINUTE'), ('MONTH'),
-('NATURAL'), ('NEW'), ('NEXT'), ('NOCYCLE'), ('NOMAXVALUE'), ('NOMINVALUE'),
('NOT'), ('NOW'), ('NULL'), ('NULLIF'), ('NUMERIC'),
-('OF'), ('OFFSET'), ('OLD'), ('ON'), ('ONLY'), ('OPTION'), ('OR'), ('ORDER'),
('OTHERS'), ('OUTER'), ('OVER'),
-('PARTIAL'), ('PARTITION'), ('POSITION'), ('PRECEDING'), ('PRESERVE'),
('PRIMARY'), ('PRIVILEGES'), ('PROCEDURE'), ('PUBLIC'),
-('RANGE'), ('READ'), ('REAL'), ('RECORDS'), ('REFERENCES'), ('REFERENCING'),
('REMOTE'), ('RENAME'), ('REPEATABLE'), ('REPLICA'), ('RESTART'), ('RESTRICT'),
('RETURN'), ('RETURNS'), ('REVOKE'), ('RIGHT'), ('ROLLBACK'), ('ROWS'),
-('SAMPLE'), ('SAVEPOINT'), ('SECOND'), ('SELECT'), ('SEQUENCE'), ('SERIAL'),
('SERIALIZABLE'), ('SESSION_USER'), ('SET'), ('SIMPLE'), ('SMALLINT'),
('SOME'), ('SPLIT_PART'), ('STDIN'), ('STDOUT'), ('STORAGE'), ('STREAM'),
('STRING'), ('SUBSTRING'), ('SYMMETRIC'),
-('THEN'), ('TIES'), ('TINYINT'), ('TO'), ('TRANSACTION'), ('TRIGGER'),
('TRUE'),
-('UNBOUNDED'), ('UNCOMMITTED'), ('UNENCRYPTED'), ('UNION'), ('UNIQUE'),
('UPDATE'), ('USER'), ('USING'),
-('VALUES'), ('VARCHAR'), ('VARYING'), ('VIEW'),
-('WHEN'), ('WHERE'), ('WHILE'), ('WITH'), ('WORK'), ('WRITE'),
-('XMLAGG'), ('XMLATTRIBUTES'), ('XMLCOMMENT'), ('XMLCONCAT'), ('XMLDOCUMENT'),
('XMLELEMENT'), ('XMLFOREST'), ('XMLNAMESPACES'), ('XMLPARSE'), ('XMLPI'),
('XMLQUERY'), ('XMLSCHEMA'), ('XMLTEXT'), ('XMLVALIDATE');
+ ('ADD'),
+ ('ADMIN'),
+ ('AFTER'),
+ ('AGGREGATE'),
+ ('ALL'),
+ ('ALTER'),
+ ('ALWAYS'),
+ ('AND'),
+ ('ANY'),
+ ('ASC'),
+ ('ASYMMETRIC'),
+ ('ATOMIC'),
+ ('AUTO_INCREMENT'),
+ ('BEFORE'),
+ ('BEGIN'),
+ ('BEST'),
+ ('BETWEEN'),
+ ('BIGINT'),
+ ('BIGSERIAL'),
+ ('BINARY'),
+ ('BLOB'),
+ ('BY'),
+ ('CALL'),
+ ('CASCADE'),
+ ('CASE'),
+ ('CAST'),
+ ('CHAIN'),
+ ('CHAR'),
+ ('CHARACTER'),
+ ('CHECK'),
+ ('CLOB'),
+ ('COALESCE'),
+ ('COMMIT'),
+ ('COMMITTED'),
+ ('CONSTRAINT'),
+ ('CONVERT'),
+ ('COPY'),
+ ('CORRESPONDING'),
+ ('CREATE'),
+ ('CROSS'),
+ ('CURRENT'),
+ ('CURRENT_DATE'),
+ ('CURRENT_ROLE'),
+ ('CURRENT_TIME'),
+ ('CURRENT_TIMESTAMP'),
+ ('CURRENT_USER'),
+ ('DAY'),
+ ('DEC'),
+ ('DECIMAL'),
+ ('DECLARE'),
+ ('DEFAULT'),
+ ('DELETE'),
+ ('DELIMITERS'),
+ ('DESC'),
+ ('DO'),
+ ('DOUBLE'),
+ ('DROP'),
+ ('EACH'),
+ ('EFFORT'),
+ ('ELSE'),
+ ('ELSEIF'),
+ ('ENCRYPTED'),
+ ('END'),
+ ('ESCAPE'),
+ ('EVERY'),
+ ('EXCEPT'),
+ ('EXCLUDE'),
+ ('EXISTS'),
+ ('EXTERNAL'),
+ ('EXTRACT'),
+ ('FALSE'),
+ ('FLOAT'),
+ ('FOLLOWING'),
+ ('FOR'),
+ ('FOREIGN'),
+ ('FROM'),
+ ('FULL'),
+ ('FUNCTION'),
+ ('GENERATED'),
+ ('GLOBAL'),
+ ('GRANT'),
+ ('GROUP'),
+ ('HAVING'),
+ ('HOUR'),
+ ('HUGEINT'),
+ ('IDENTITY'),
+ ('IF'),
+ ('ILIKE'),
+ ('IN'),
+ ('INDEX'),
+ ('INNER'),
+ ('INSERT'),
+ ('INT'),
+ ('INTEGER'),
+ ('INTERSECT'),
+ ('INTO'),
+ ('IS'),
+ ('ISOLATION'),
+ ('JOIN'),
+ ('LEFT'),
+ ('LIKE'),
+ ('LIMIT'),
+ ('LOCAL'),
+ ('LOCALTIME'),
+ ('LOCALTIMESTAMP'),
+ ('LOCKED'),
+ ('MEDIUMINT'),
+ ('MERGE'),
+ ('MINUTE'),
+ ('MONTH'),
+ ('NATURAL'),
+ ('NEW'),
+ ('NEXT'),
+ ('NOCYCLE'),
+ ('NOMAXVALUE'),
+ ('NOMINVALUE'),
+ ('NOT'),
+ ('NOW'),
+ ('NULL'),
+ ('NULLIF'),
+ ('NUMERIC'),
+ ('OF'),
+ ('OFFSET'),
+ ('OLD'),
+ ('ON'),
+ ('ONLY'),
+ ('OPTION'),
+ ('OR'),
+ ('ORDER'),
+ ('OTHERS'),
+ ('OUTER'),
+ ('OVER'),
+ ('PARTIAL'),
+ ('PARTITION'),
+ ('POSITION'),
+ ('PRECEDING'),
+ ('PRESERVE'),
+ ('PRIMARY'),
+ ('PRIVILEGES'),
+ ('PROCEDURE'),
+ ('PUBLIC'),
+ ('RANGE'),
+ ('READ'),
+ ('REAL'),
+ ('RECORDS'),
+ ('REFERENCES'),
+ ('REFERENCING'),
+ ('REMOTE'),
+ ('RENAME'),
+ ('REPEATABLE'),
+ ('REPLICA'),
+ ('RESTART'),
+ ('RESTRICT'),
+ ('RETURN'),
+ ('RETURNS'),
+ ('REVOKE'),
+ ('RIGHT'),
+ ('ROLLBACK'),
+ ('ROWS'),
+ ('SAMPLE'),
+ ('SAVEPOINT'),
+ ('SECOND'),
+ ('SELECT'),
+ ('SEQUENCE'),
+ ('SERIAL'),
+ ('SERIALIZABLE'),
+ ('SESSION_USER'),
+ ('SET'),
+ ('SIMPLE'),
+ ('SMALLINT'),
+ ('SOME'),
+ ('SPLIT_PART'),
+ ('STDIN'),
+ ('STDOUT'),
+ ('STORAGE'),
+ ('STREAM'),
+ ('STRING'),
+ ('SUBSTRING'),
+ ('SYMMETRIC'),
+ ('THEN'),
+ ('TIES'),
+ ('TINYINT'),
+ ('TO'),
+ ('TRANSACTION'),
+ ('TRIGGER'),
+ ('TRUE'),
+ ('UNBOUNDED'),
+ ('UNCOMMITTED'),
+ ('UNENCRYPTED'),
+ ('UNION'),
+ ('UNIQUE'),
+ ('UPDATE'),
+ ('USER'),
+ ('USING'),
+ ('VALUES'),
+ ('VARCHAR'),
+ ('VARYING'),
+ ('VIEW'),
+ ('WHEN'),
+ ('WHERE'),
+ ('WHILE'),
+ ('WITH'),
+ ('WORK'),
+ ('WRITE'),
+ ('XMLAGG'),
+ ('XMLATTRIBUTES'),
+ ('XMLCOMMENT'),
+ ('XMLCONCAT'),
+ ('XMLDOCUMENT'),
+ ('XMLELEMENT'),
+ ('XMLFOREST'),
+ ('XMLNAMESPACES'),
+ ('XMLPARSE'),
+ ('XMLPI'),
+ ('XMLQUERY'),
+ ('XMLSCHEMA'),
+ ('XMLTEXT'),
+ ('XMLVALIDATE');
ALTER TABLE sys.keywords SET READ ONLY;
GRANT SELECT ON sys.keywords TO PUBLIC;
@@ -41,13 +237,27 @@ CREATE TABLE sys.table_types (
table_type_id SMALLINT NOT NULL PRIMARY KEY,
table_type_name VARCHAR(25) NOT NULL UNIQUE);
--- Values taken from sql/include/sql_catalog.h see enum table_types: table =
0, view = 1, merge_table = 3, stream = 4, remote = 5, replica_table = 6.
--- Note: values 10, 11, 20 and 30 are synthetically constructed, see view
sys.tables. Do not change them as they are used by ODBC
SQLTables(SQL_ALL_TABLE_TYPES) and JDBC methods getTableTypes() and getTables()
+-- Values taken from sql/include/sql_catalog.h see enum table_types:
+-- table = 0, view = 1, merge_table = 3, stream = 4, remote = 5,
+-- replica_table = 6.
+-- Note: values 10, 11, 20 and 30 are synthetically constructed, see
+-- view sys.tables. Do not change them as they are used by ODBC
+-- SQLTables(SQL_ALL_TABLE_TYPES) and JDBC methods getTableTypes() and
+-- getTables()
INSERT INTO sys.table_types (table_type_id, table_type_name) VALUES
- (0, 'TABLE'), (1, 'VIEW'), (3, 'MERGE TABLE'), (4, 'STREAM TABLE'), (5,
'REMOTE TABLE'), (6, 'REPLICA TABLE'),
--- synthetically constructed system obj variants (added 10 to sys._tables.type
value when sys._tables.system is true).
- (10, 'SYSTEM TABLE'), (11, 'SYSTEM VIEW'),
--- synthetically constructed temporary variants (added 20 or 30 to
sys._tables.type value depending on values of temporary and commit_action).
+ (0, 'TABLE'),
+ (1, 'VIEW'),
+ (3, 'MERGE TABLE'),
+ (4, 'STREAM TABLE'),
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
