Changeset: 2f51131f2a2c for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2f51131f2a2c Added Files: sql/benchmarks/tpcds/Tests/load.timeout sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.sql sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.err sql/test/BugTracker-2017/Tests/error-clean-cache.Bug-6351.stable.out sql/test/BugTracker-2019/Tests/drop-table-cascade.Bug-6805.sql sql/test/BugTracker-2019/Tests/drop-table-cascade.Bug-6805.stable.err sql/test/BugTracker-2019/Tests/drop-table-cascade.Bug-6805.stable.out tools/merovingian/client/Tests/All tools/merovingian/client/Tests/monetdb_status.py Modified Files: .hgtags MonetDB.spec NT/monetdb_config.h.in NT/rules.msc clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 clients/mapiclient/mhelp.c clients/mapilib/mapi.rc clients/odbc/driver/SQLColumnPrivileges.c clients/odbc/driver/SQLColumns.c clients/odbc/driver/SQLExecDirect.c clients/odbc/driver/SQLForeignKeys.c clients/odbc/driver/SQLPrimaryKeys.c clients/odbc/driver/SQLProcedureColumns.c clients/odbc/driver/SQLProcedures.c clients/odbc/driver/SQLSpecialColumns.c clients/odbc/driver/SQLStatistics.c clients/odbc/driver/SQLTablePrivileges.c clients/odbc/driver/SQLTables.c clients/odbc/driver/driver.rc clients/odbc/winsetup/setup.rc configure.ag debian/changelog gdk/gdk.h gdk/libbat.rc geom/monetdb5/geom.c monetdb5/mal/mal_function.c monetdb5/mal/mal_resource.c monetdb5/modules/atoms/uuid.mal monetdb5/modules/mal/orderidx.mal monetdb5/modules/mal/sysmon.c monetdb5/modules/mal/tablet.c monetdb5/modules/mal/wlc.c monetdb5/modules/mal/wlc.h monetdb5/optimizer/opt_garbageCollector.c monetdb5/optimizer/opt_mitosis.c monetdb5/optimizer/opt_reorder.c monetdb5/tools/libmonetdb5.rc sql/backends/monet5/sql.c sql/backends/monet5/sql.mal sql/backends/monet5/sql_execute.c sql/backends/monet5/sql_scenario.c sql/backends/monet5/sql_subquery.mal sql/backends/monet5/sql_upgrades.c sql/include/sql_catalog.h sql/odbc/samples/Tests/odbcsample1.SQL.sh sql/odbc/samples/Tests/testgetinfo.SQL.sh sql/scripts/22_clients.sql sql/scripts/26_sysmon.sql sql/server/rel_optimizer.c sql/server/rel_rel.c sql/server/rel_select.c sql/server/rel_unnest.c sql/server/sql_mvc.c sql/server/sql_mvc.h sql/server/sql_qc.c sql/server/sql_qc.h sql/storage/sql_catalog.c sql/storage/store.c sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.sql sql/test/BugTracker-2014/Tests/current_timestamp.Bug-3427.stable.err sql/test/BugTracker-2014/Tests/queueError.Bug-3604.sql sql/test/BugTracker-2014/Tests/queueError.Bug-3604.stable.out sql/test/BugTracker-2017/Tests/All sql/test/BugTracker-2017/Tests/crash_correlated_subqueries_in_select.Bug-6254.stable.out sql/test/BugTracker-2017/Tests/limit.Bug-6322.stable.out sql/test/BugTracker-2017/Tests/push_subslice.Bug-6322.stable.out sql/test/BugTracker-2019/Tests/All sql/test/Tests/session_vars.sql sql/test/Tests/session_vars.stable.err sql/test/Tests/session_vars.stable.out sql/test/Users/Tests/sessioncontrol.sql sql/test/Users/Tests/sessioncontrol.stable.out sql/test/Via-m/Tests/event_s03.stable.out sql/test/Via-m/Tests/event_s05.stable.out sql/test/Via-m/Tests/event_s07.stable.out sql/test/Via-m/Tests/event_s09.stable.out sql/test/Via-m/Tests/event_s11.stable.err sql/test/Via-m/Tests/event_s11.stable.out sql/test/Via-m/Tests/file_s04.stable.out sql/test/Via-m/Tests/file_s05.stable.out sql/test/Via-m/Tests/file_s06.stable.out sql/test/Via-m/Tests/file_s08.stable.out sql/test/Via-m/Tests/file_s10.stable.out sql/test/Via-m/Tests/file_s12.stable.out sql/test/Via-m/Tests/file_s15.stable.out sql/test/Via-m/Tests/media_s04.stable.out sql/test/Via-m/Tests/media_s06.stable.out sql/test/Via-m/Tests/media_s08.stable.out sql/test/Via-m/Tests/media_s10.stable.out sql/test/Via-m/Tests/media_s12.stable.out sql/test/Via-m/Tests/media_s14.stable.out sql/test/Via-m/Tests/media_s16.stable.out sql/test/Via-m/Tests/media_s18.stable.out sql/test/Via-m/Tests/media_s19.stable.out sql/test/Via-m/insert_event1.sql sql/test/Via-m/insert_event2.sql sql/test/Via-m/insert_event3.sql sql/test/Via-m/insert_event4.sql sql/test/Via-m/insert_file2.sql sql/test/Via-m/insert_file3.sql sql/test/Via-m/insert_file4.sql sql/test/Via-m/insert_file5.sql sql/test/Via-m/insert_file6.sql sql/test/Via-m/insert_file7.sql sql/test/Via-m/insert_file8.sql sql/test/Via-m/insert_media1.sql sql/test/Via-m/insert_media2.sql sql/test/Via-m/insert_media3.sql sql/test/Via-m/insert_media4.sql sql/test/Via-m/insert_media5.sql sql/test/Via-m/insert_media6.sql sql/test/Via-m/insert_media7.sql sql/test/analytics/Tests/analytics09.sql sql/test/analytics/Tests/analytics09.stable.err sql/test/analytics/Tests/analytics09.stable.out sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128 sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.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 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/mergetables/Tests/sqlsmith-exists.stable.out sql/test/mergetables/Tests/sqlsmith-exists2.stable.out sql/test/miscellaneous/Tests/deallocate.sql sql/test/miscellaneous/Tests/deallocate.stable.out sql/test/pg_regress/Tests/timestamp.sql sql/test/pg_regress/Tests/timestamptz.sql sql/test/ssqq/Tests/insert_query.stable.out sql/test/ssqq/Tests/insert_queue.stable.out sql/test/ssqq/Tests/insert_quser.stable.out sql/test/ssqq/insert_query.sql sql/test/ssqq/insert_queue.sql sql/test/ssqq/insert_quser.sql sql/test/subquery/Tests/subquery3.sql sql/test/subquery/Tests/subquery3.stable.err sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.sql sql/test/sys-schema/Tests/check_PrimaryKey_uniqueness.stable.out sql/test/sys-schema/Tests/systemfunctions.stable.out sql/test/sys-schema/Tests/systemfunctions.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 tools/merovingian/daemon/connections.c vertoo.data Branch: linear-hashing Log Message:
Merge with default branch. diffs (truncated from 82791 to 300 lines): diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -747,3 +747,6 @@ fffd3aabeae5e2c5b535179471e5730742962a76 e0719bdebf32967ca0a0043f556b3f48f93e0ce0 Nov2019_7 fffd3aabeae5e2c5b535179471e5730742962a76 Nov2019_SP1_release e0719bdebf32967ca0a0043f556b3f48f93e0ce0 Nov2019_SP1_release +8d4258444e2a0a809468fb85be7999a407d47e04 Nov2019_9 +e0719bdebf32967ca0a0043f556b3f48f93e0ce0 Nov2019_SP1_release +8d4258444e2a0a809468fb85be7999a407d47e04 Nov2019_SP1_release diff --git a/MonetDB.spec b/MonetDB.spec --- a/MonetDB.spec +++ b/MonetDB.spec @@ -1061,6 +1061,10 @@ fi %postun -p /sbin/ldconfig %changelog +* Wed Dec 18 2019 Sjoerd Mullender <[email protected]> - 11.35.9-20191218 +- Rebuilt. +- BZ#6804: DNS resolution of 0.0.0.0 fails on recent Ubuntus + * Tue Dec 17 2019 Sjoerd Mullender <[email protected]> - 11.35.7-20191217 - Rebuilt. diff --git a/NT/rules.msc b/NT/rules.msc --- a/NT/rules.msc +++ b/NT/rules.msc @@ -75,7 +75,7 @@ PYTHON2LIB=python27.lib PYTHON3BASE=C:\Python32 !ENDIF !IFNDEF PYTHON3LIB -PYTHON3LIB=python32.lib +PYTHON3LIB=python37.lib !ENDIF PYTHON_LIBDIR=share\MonetDB\python @@ -176,12 +176,12 @@ R.lib: "$(libr_DLL)" !ENDIF !IFDEF HAVE_LIBPY2 -libpy2_LIBS = "$(PYTHON2DIR)\libs\python27.lib" +libpy2_LIBS = "$(PYTHON2DIR)\libs\$(PYTHON2LIB)" libpy2_CFLAGS = -DHAVE_LIBPY2 "-I$(PYTHON2DIR)\include" "-I$(PYTHON2DIR)\Lib\site-packages\numpy\core\include" !ENDIF !IFDEF HAVE_LIBPY3 -libpy3_LIBS = "$(PYTHON3DIR)\libs\python37.lib" +libpy3_LIBS = "$(PYTHON3DIR)\libs\$(PYTHON3LIB)" libpy3_CFLAGS = -DHAVE_LIBPY3 "-I$(PYTHON3DIR)\include" "-I$(PYTHON3DIR)\Lib\site-packages\numpy\core\include" !ENDIF diff --git a/clients/Tests/MAL-signatures.stable.out b/clients/Tests/MAL-signatures.stable.out --- a/clients/Tests/MAL-signatures.stable.out +++ b/clients/Tests/MAL-signatures.stable.out @@ -11758,7 +11758,7 @@ stdout of test 'MAL-signatures` in direc [ "sql", "percent_rank", "pattern sql.percent_rank(b:any_1, p:bit, o:bit):dbl ", "SQLpercent_rank;", "return the percentage into the total number of groups for each row" ] [ "sql", "prelude", "pattern sql.prelude():void ", "SQLprelude;", "" ] [ "sql", "prepared_statements", "pattern sql.prepared_statements() (sessionid:bat[:int], user:bat[:str], statementid:bat[:int], statement:bat[:str], created:bat[:timestamp]) ", "SQLsession_prepared_statements;", "Available prepared statements in the current session" ] -[ "sql", "prepared_statements_args", "pattern sql.prepared_statements_args() (statementid:bat[:int], parameter:bat[:bit], type:bat[:str], digits:bat[:int], scale:bat[:int], schema:bat[:str], table:bat[:str], column:bat[:str]) ", "SQLsession_prepared_statements_args;", "Available prepared statements' arguments in the current session" ] +[ "sql", "prepared_statements_args", "pattern sql.prepared_statements_args() (statementid:bat[:int], type:bat[:str], digits:bat[:int], scale:bat[:int], inout:bat[:bte], number:bat[:int], schema:bat[:str], table:bat[:str], column:bat[:str]) ", "SQLsession_prepared_statements_args;", "Available prepared statements' arguments in the current session" ] [ "sql", "prod", "pattern sql.prod(b:bte, s:lng, e:lng):lng ", "SQLprod;", "return the product of groups" ] [ "sql", "prod", "pattern sql.prod(b:dbl, s:lng, e:lng):dbl ", "SQLprod;", "return the product of groups" ] [ "sql", "prod", "pattern sql.prod(b:flt, s:lng, e:lng):dbl ", "SQLprod;", "return the product of groups" ] diff --git a/clients/Tests/MAL-signatures.stable.out.int128 b/clients/Tests/MAL-signatures.stable.out.int128 --- a/clients/Tests/MAL-signatures.stable.out.int128 +++ b/clients/Tests/MAL-signatures.stable.out.int128 @@ -16164,7 +16164,7 @@ stdout of test 'MAL-signatures` in direc [ "sql", "percent_rank", "pattern sql.percent_rank(b:any_1, p:bit, o:bit):dbl ", "SQLpercent_rank;", "return the percentage into the total number of groups for each row" ] [ "sql", "prelude", "pattern sql.prelude():void ", "SQLprelude;", "" ] [ "sql", "prepared_statements", "pattern sql.prepared_statements() (sessionid:bat[:int], user:bat[:str], statementid:bat[:int], statement:bat[:str], created:bat[:timestamp]) ", "SQLsession_prepared_statements;", "Available prepared statements in the current session" ] -[ "sql", "prepared_statements_args", "pattern sql.prepared_statements_args() (statementid:bat[:int], parameter:bat[:bit], type:bat[:str], digits:bat[:int], scale:bat[:int], schema:bat[:str], table:bat[:str], column:bat[:str]) ", "SQLsession_prepared_statements_args;", "Available prepared statements' arguments in the current session" ] +[ "sql", "prepared_statements_args", "pattern sql.prepared_statements_args() (statementid:bat[:int], type:bat[:str], digits:bat[:int], scale:bat[:int], inout:bat[:bte], number:bat[:int], schema:bat[:str], table:bat[:str], column:bat[:str]) ", "SQLsession_prepared_statements_args;", "Available prepared statements' arguments in the current session" ] [ "sql", "prod", "pattern sql.prod(b:bte, s:lng, e:lng):hge ", "SQLprod;", "return the product of groups" ] [ "sql", "prod", "pattern sql.prod(b:bte, s:lng, e:lng):lng ", "SQLprod;", "return the product of groups" ] [ "sql", "prod", "pattern sql.prod(b:dbl, s:lng, e:lng):dbl ", "SQLprod;", "return the product of groups" ] diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c --- a/clients/mapiclient/mhelp.c +++ b/clients/mapiclient/mhelp.c @@ -43,21 +43,6 @@ typedef struct { SQLhelp sqlhelp1[] = { // major commands - {"ALTER TABLE", - "", - "ALTER TABLE [ IF EXISTS ] qname ADD [ COLUMN ] { column_def | table_constraint }\n" - "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET DEFAULT value\n" - "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET [NOT] NULL\n" - "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident DROP DEFAULT\n" - "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET STORAGE {string | NULL}\n" - "ALTER TABLE [ IF EXISTS ] qname RENAME [ COLUMN ] ident TO ident\n" - "ALTER TABLE [ IF EXISTS ] qname DROP [ COLUMN ] ident [ RESTRICT | CASCADE ]\n" - "ALTER TABLE [ IF EXISTS ] qname DROP CONSTRAINT ident [ RESTRICT | CASCADE ]\n" - "ALTER TABLE [ IF EXISTS ] qname RENAME TO ident\n" - "ALTER TABLE [ IF EXISTS ] qname SET { { READ | INSERT } ONLY | READ WRITE }\n" - "ALTER TABLE [ IF EXISTS ] qname SET SCHEMA ident", - "qname,column_def,table_constraint,ident", - "See also https://www.monetdb.org/Documentation/SQLreference/Alter"}, {"ALTER MERGE TABLE", "", "ALTER TABLE [ IF EXISTS ] qname ADD TABLE qname [ AS PARTITION partition_spec ]\n" @@ -76,6 +61,22 @@ SQLhelp sqlhelp1[] = { "[MINVALUE intval | NO MINVALUE] [MAXVALUE intval | NO MAXVALUE] [CACHE intval] [[NO] CYCLE]", "int_datatype,intval", "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"}, + {"ALTER TABLE", + "", + "ALTER TABLE [ IF EXISTS ] qname ADD [ COLUMN ] column_def\n" + "ALTER TABLE [ IF EXISTS ] qname ADD table_constraint\n" + "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET DEFAULT value\n" + "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET [NOT] NULL\n" + "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident DROP DEFAULT\n" + "ALTER TABLE [ IF EXISTS ] qname ALTER [ COLUMN ] ident SET STORAGE {string | NULL}\n" + "ALTER TABLE [ IF EXISTS ] qname DROP [ COLUMN ] ident [ RESTRICT | CASCADE ]\n" + "ALTER TABLE [ IF EXISTS ] qname DROP CONSTRAINT ident [ RESTRICT | CASCADE ]\n" + "ALTER TABLE [ IF EXISTS ] qname RENAME [ COLUMN ] ident TO ident\n" + "ALTER TABLE [ IF EXISTS ] qname RENAME TO ident\n" + "ALTER TABLE [ IF EXISTS ] qname SET { INSERT ONLY | READ ONLY | READ WRITE }\n" + "ALTER TABLE [ IF EXISTS ] qname SET SCHEMA ident", + "qname,column_def,table_constraint,ident", + "See also https://www.monetdb.org/Documentation/SQLreference/Alter"}, {"ALTER USER", "Change a user's login name or password or default schema", "ALTER USER ident RENAME TO ident\n" @@ -90,14 +91,9 @@ SQLhelp sqlhelp1[] = { "ident,column_list", "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"}, {"CALL", - "", + "Call a stored procedure", "CALL qname '(' [ scalar_expression [',' ...] ] ')' | CALL ident '.' ident", NULL, - NULL}, - {"CASE", - "Case statement for procedures/functions", - "CASE scalar_expression [ when_statement ...] [ELSE procedure_statement ... ] END CASE", - NULL, "See also https://www.monetdb.org/Documentation/SQLreference/Flowofcontrol"}, {"COMMENT", "Add, update or remove a comment or description for a database object", @@ -167,14 +163,6 @@ SQLhelp sqlhelp1[] = { "CREATE [ UNIQUE | ORDERED | IMPRINTS ] INDEX ident ON qname '(' ident_list ')'", NULL, "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/Indices"}, - {"CREATE PROCEDURE", - "Create a user-defined procedure", - "CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]] } ')'\n" - " BEGIN [ ATOMIC ] procedure_statement [ ';' ...] END\n" - "CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]] } ')'\n" - " EXTERNAL NAME ident ',' ident", - "qname,param,procedure_statement,ident", - "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/Procedures"}, {"CREATE LOADER", "Create a custom (external) data loader function. The body is defined in Python language", "CREATE [ OR REPLACE ] LOADER qname '(' [ param [',' ...]] ')'\n" @@ -186,6 +174,14 @@ SQLhelp sqlhelp1[] = { "CREATE MERGE TABLE [ IF NOT EXISTS ] qname table_source [ partition_by ]", "table_source,partition_by", "See also https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/DataPartitioning"}, + {"CREATE PROCEDURE", + "Create a user-defined procedure", + "CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]] } ')'\n" + " BEGIN [ ATOMIC ] procedure_statement [ ';' ...] END\n" + "CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]] } ')'\n" + " EXTERNAL NAME ident ',' ident", + "qname,param,procedure_statement,ident", + "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/Procedures"}, {"CREATE REMOTE TABLE", "", "CREATE REMOTE TABLE [ IF NOT EXISTS ] qname ON string [WITH [USER 'username'] [[ENCRYPTED] PASSWORD 'password']]", @@ -278,33 +274,18 @@ SQLhelp sqlhelp1[] = { "CURRENT_USER | USER", NULL, NULL}, - {"EXPLAIN", - "Give execution plan details", - "EXPLAIN statement", - NULL, - "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/Explain"}, - {"LOCALTIME", - "Pseudo column or function to get the current client time excluding timezone", - "LOCALTIME [ '(' ')' ]", + {"DEBUG", + "Debug a SQL statement using MAL debugger", + "DEBUG statement", NULL, - NULL}, - {"LOCALTIMESTAMP", - "Pseudo column or function to get the current client timestamp excluding timezone", - "LOCALTIMESTAMP [ '(' ')' ]", - NULL, - NULL}, - {"EXTRACT", - "Built-in function", - "EXTRACT '(' { YEAR | MONTH | DAY | HOUR | MINUTE | SECOND | CENTURY | DECADE | QUARTER | WEEK | DOW | DOY } FROM scalar_expression ')'", - NULL, - NULL}, + "https://www.monetdb.org/Documentation/Manuals/SQLreference/Debug"}, {"DECLARE", "Define a local variable", "DECLARE ident_list data_type", "ident_list,data_type", NULL}, {"DELETE", - "", + "Remove data rows from a table", "[ WITH cte_list ] DELETE FROM qname [ [AS] ident ] [ WHERE search_condition ]", "cte_list,search_condition", NULL}, @@ -377,16 +358,25 @@ SQLhelp sqlhelp1[] = { "DROP VIEW [ IF EXISTS ] qname [ RESTRICT | CASCADE ]", NULL, NULL}, - {"IF", - "", - "IF search_condition THEN procedure_statement ...\n" - "[ELSE IF search_condition THEN procedure_statement ... ]...\n" - "[ ELSE procedure_statement ... ] END IF", - "search_condition,procedure_statement", - "See also https://www.monetdb.org/Documentation/SQLreference/Flowofcontrol"}, + {"EXECUTE", + "Execute a prepared SQL statement with supplied parameter values", + "EXECUTE {intnr | **} '(' [ value [, ...] ] ')'", + NULL, + "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/PrepareExec"}, + {"EXPLAIN", + "Give MAL execution plan for the SQL statement", + "EXPLAIN statement", + NULL, + "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/Explain"}, + {"EXTRACT", + "Built-in function", + "EXTRACT '(' { YEAR | MONTH | DAY | HOUR | MINUTE | SECOND | CENTURY | DECADE | QUARTER | WEEK | DOW | DOY } FROM scalar_expression ')'", + NULL, + NULL}, {"INSERT", - "", - "[ WITH cte_list ] INSERT INTO qname [ column_list ] [ { DEFAULT VALUES | VALUES row_values | query_expression } ]", + "Add data rows to a table", + "[ WITH cte_list ] INSERT INTO qname [ column_list ]\n" + " [ { DEFAULT VALUES | VALUES row_values | query_expression } ]", "cte_list,column_list,row_values,query_expression", "See also https://www.monetdb.org/Documentation/SQLreference/Updates"}, {"GRANT", @@ -395,21 +385,36 @@ SQLhelp sqlhelp1[] = { "GRANT role [',' ...] TO grantee [',' ...] [ WITH ADMIN OPTION]", "privileges,table_privileges,global_privileges,role,grantee", "See also https://www.monetdb.org/Documentation/SQLreference/Permissions"}, + {"LOCALTIME", + "Pseudo column or function to get the current client time excluding timezone", + "LOCALTIME [ '(' ')' ]", + NULL, + NULL}, + {"LOCALTIMESTAMP", + "Pseudo column or function to get the current client timestamp excluding timezone", + "LOCALTIMESTAMP [ '(' ')' ]", + NULL, + NULL}, {"MERGE", "", "[ WITH cte_list ] MERGE INTO qname [ [AS] ident ] USING table_ref [ [AS] ident ] ON search_condition merge_list", "cte_list,table_ref,search_condition,merge_list", "See also: https://www.monetdb.org/blog/sql2003_merge_statements_now_supported"}, + {"PLAN", + "Give relational execution plan for the SQL statement", + "PLAN statement", + NULL, + "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/PlanSQL"}, + {"PREPARE", + "Prepare a SQL DML statement with optional question-mark parameter markers", + "PREPARE statement", + NULL, + "See also https://www.monetdb.org/Documentation/Manuals/SQLreference/PrepareExec"}, {"RELEASE SAVEPOINT", "", "RELEASE SAVEPOINT ident", NULL, NULL}, - {"RETURN", - "", - "RETURN { query_expression | search_condition | TABLE '(' query_expression ')'", - "query_expression,search_condition", - NULL}, {"REVOKE", "Remove some privileges", "REVOKE [GRANT OPTION FOR] privileges FROM { grantee [',' ...] | CURRENT_USER | CURRENT_ROLE }\n" @@ -454,12 +459,12 @@ SQLhelp sqlhelp1[] = { "transactionmode,isolevel", "DIAGNOSTICS is not yet supported"}, {"SET ROLE", - "", + "Change current role", "SET ROLE ident", NULL, NULL}, {"SET SCHEMA", - "", + "Change current schema", "SET SCHEMA ident", NULL, NULL}, _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
