Changeset: 09ae4f3f86a8 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09ae4f3f86a8
Added Files:
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.sql
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.stable.err
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-6669.stable.out
sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.sql
sql/test/BugTracker-2019/Tests/insert-replica-table.Bug-6684.stable.err
sql/test/BugTracker-2019/Tests/subselect-contradiction.Bug-6683.sql
sql/test/BugTracker-2019/Tests/subselect-contradiction.Bug-6683.stable.err
sql/test/BugTracker-2019/Tests/subselect-contradiction.Bug-6683.stable.out
sql/test/in-value-list/Tests/All
sql/test/in-value-list/Tests/various-in-value-list-queries.sql
sql/test/in-value-list/Tests/various-in-value-list-queries.stable.err
sql/test/in-value-list/Tests/various-in-value-list-queries.stable.out
Removed Files:
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-67999.sql
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-67999.stable.err
sql/test/BugTracker-2019/Tests/copy-into-from-stdin-empty-line.Bug-67999.stable.out
Modified Files:
ChangeLog
MonetDB.spec
NT/rules.msc
buildtools/selinux/monetdb.te
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/dump.c
clients/mapiclient/mclient.1
clients/mapiclient/mclient.c
clients/mapiclient/mhelp.c
clients/mapiclient/msqldump.c
clients/mapiclient/msqldump.h
common/stream/stream.c
common/utils/Makefile.ag
configure.ag
gdk/ChangeLog
gdk/ChangeLog.Apr2019
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_atomic.h
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.c
gdk/gdk_calc_private.h
gdk/gdk_delta.c
gdk/gdk_firstn.c
gdk/gdk_group.c
gdk/gdk_hash.h
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_orderidx.c
gdk/gdk_private.h
gdk/gdk_qsort.c
gdk/gdk_qsort_impl.h
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_system_private.h
gdk/gdk_tm.c
gdk/gdk_utils.c
gdk/gdk_value.c
geom/monetdb5/geom.c
geom/monetdb5/geom.h
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out.Windows
monetdb5/extras/rapi/converters.c.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_instruction.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/blob.c
monetdb5/modules/atoms/blob.h
monetdb5/modules/atoms/color.c
monetdb5/modules/atoms/color.h
monetdb5/modules/atoms/identifier.c
monetdb5/modules/atoms/inet.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.h
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/url.c
monetdb5/modules/atoms/url.h
monetdb5/modules/atoms/uuid.c
monetdb5/modules/atoms/xml.c
monetdb5/modules/atoms/xml.h
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/wlc.mal
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_support.c
monetdb5/tools/Makefile.ag
rpm.mk.in
sql/ChangeLog
sql/ChangeLog.Apr2019
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/UDF/pyapi/conversion.c
sql/backends/monet5/UDF/pyapi/convert_loops.h
sql/backends/monet5/UDF/pyapi/type_conversion.c
sql/backends/monet5/UDF/udf/udf.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rel_bin.h
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_cat.h
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_rank.c
sql/backends/monet5/sql_rank.h
sql/backends/monet5/sql_rank.mal
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sqlcatalog.mal
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out
sql/backends/monet5/vaults/bam/Tests/query2.2.stable.out.int128
sql/backends/monet5/vaults/bam/bam_db_interface.c
sql/backends/monet5/vaults/bam/bam_export.c
sql/backends/monet5/vaults/bam/bam_lib.c
sql/backends/monet5/wlr.mal
sql/common/sql_list.c
sql/common/sql_string.c
sql/common/sql_types.c
sql/include/sql_catalog.h
sql/include/sql_relation.h
sql/jdbc/tests/Tests/BugResultSetMetaData_Bug_6183.stable.out
sql/scripts/70_storagemodel.sql
sql/server/rel_dump.c
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_semantic.c
sql/server/rel_sequence.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.h
sql/server/sql_parser.y
sql/server/sql_partition.c
sql/server/sql_privileges.c
sql/server/sql_scan.c
sql/storage/bat/bat_logger.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_table.c
sql/storage/sql_catalog.c
sql/storage/sql_storage.h
sql/storage/store.c
sql/test/BugDay_2005-10-06_2.9.3/Tests/UNION_JOIN_vs_plain_set_UNION-2.SF-920585.sql
sql/test/BugDay_2005-10-06_2.9.3/Tests/foreign_key_in_frontend_crashes_backend.SF-935578.sql
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.err
sql/test/BugTracker-2009/Tests/copy_multiple_files.SF-2902320.stable.out.Windows
sql/test/BugTracker-2010/Tests/multiple-common-table-expressions.Bug-2664.sql
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.sql
sql/test/BugTracker-2012/Tests/strange_escaping_in_csv.Bug-2133.stable.out
sql/test/BugTracker-2013/Tests/aggregates-typing-issues.Bug-3277.sql
sql/test/BugTracker-2013/Tests/median-null.Bug-3280.sql
sql/test/BugTracker-2014/Tests/null_in_string.Bug-2014.sql
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2015/Tests/is_null_limit.Bug-3684.sql
sql/test/BugTracker-2016/Tests/storagemodel.stable.out
sql/test/BugTracker-2016/Tests/trigger_bulk.Bug-4045.stable.err
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/semijoinunion.Bug-6150.sql
sql/test/BugTracker-2018/Tests/All
sql/test/BugTracker-2018/Tests/count_from_commented_function_signatures.Bug-6542.stable.out
sql/test/BugTracker-2018/Tests/groupby_having_orderby_count.Bug-6624.stable.out
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.sql
sql/test/BugTracker-2018/Tests/in-subquery-having-Bug-6651.stable.out
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.sql
sql/test/BugTracker-2018/Tests/sqlitelogictest-groupby-coalesce-error-message.Bug-6608.stable.out
sql/test/BugTracker-2019/Tests/All
sql/test/Dependencies/Tests/Dependencies.stable.out
sql/test/Dependencies/Tests/Dependencies.stable.out.int128
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out.int128
sql/test/Dump/Tests/dump.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out
sql/test/SQLite_regress/sqllogictest/Tests/select3.test.stable.out.int128
sql/test/Tests/rank.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/bugs/Tests/innerjoin_multiple-bug-sf-943661.stable.out
sql/test/copy/Tests/int_parse.sql
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/int_parse_best.sql
sql/test/copy/Tests/key_copy.sql
sql/test/copy/Tests/key_copy.stable.err
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
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/group-concat/Tests/groupconcat05.stable.out
sql/test/json/Tests/jsonvalidity.Bug-3753.stable.out
sql/test/mergetables/Tests/sqlsmith-apply-outer-join-or.sql
sql/test/orderidx/Tests/imprints_all_types.stable.out
sql/test/orderidx/Tests/oidx_all_types.stable.out
sql/test/pg_regress/Tests/point.stable.out
sql/test/rank.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.sql
sql/test/sys-schema/Tests/check_ForeignKey_referential_integrity.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/dump.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb/Tests/All
testing/Mtest.py.in
testing/malcheck.py
testing/process.py
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/argvcmds.c
tools/merovingian/daemon/config/monetdbd.service.in
tools/merovingian/daemon/merovingian.c
tools/mserver/monet_version.c.in
tools/mserver/mserver5.1.in
tools/mserver/mserver5.c
Branch: translate-scripts
Log Message:
Merge with default.
diffs (truncated from 2995 to 300 lines):
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,2 +1,3 @@
# ChangeLog file for devel
# This file is updated with Maddlog
+
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -895,7 +895,10 @@ automatic index management, extensibilit
accelerators. It also has an SQL frontend.
This package contains the SELinux policy for running MonetDB under
-control of systemd.
+control of systemd. There is one tunable parameter, mserver5_can_read_home,
+which can be set using "setsebool -P mserver5_can_read_home=true" to allow
+an mserver5 process started by monetdbd under the control of systemd to
+read files in users' home directories.
%post selinux
for selinuxvariant in %{selinux_variants}
diff --git a/buildtools/selinux/monetdb.te b/buildtools/selinux/monetdb.te
--- a/buildtools/selinux/monetdb.te
+++ b/buildtools/selinux/monetdb.te
@@ -1,4 +1,4 @@
-policy_module(monetdb, 0.3)
+policy_module(monetdb, 0.4)
# The above line declares that this file is a SELinux policy file. Its
# name is monetdb, so the file should be saved as monetdb.te
@@ -7,6 +7,7 @@ require {
type proc_net_t;
type tmp_t;
type var_t;
+ type user_home_t;
class dir { read };
class fd { use };
class fifo_file { getattr read write };
@@ -119,4 +120,9 @@ manage_sock_files_pattern(mserver5_t, ms
allow mserver5_t monetdbd_t:fifo_file { read write getattr };
allow mserver5_t monetdbd_t:unix_stream_socket { read write getopt shutdown };
allow mserver5_t var_t:dir { read };
+gen_tunable(mserver5_can_read_home, false)
+tunable_policy(`mserver5_can_read_home', `
+ userdom_search_user_home_dirs(mserver5_t)
+ allow mserver5_t user_home_t:file read_file_perms;
+')
allow monetdbd_t mserver5_t:unix_stream_socket { connectto };
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -314,8 +314,10 @@ void *MT_mmap(const char *path, int mode
int MT_munmap(void *p, size_t len);
bool MT_path_absolute(const char *path);
void MT_sleep_ms(unsigned int ms);
+void *MT_thread_getdata(void);
+const char *MT_thread_getname(void);
bool MT_thread_init(void);
-const char *MT_thread_name(void);
+void MT_thread_setdata(void *data);
void MT_thread_setname(const char *name);
void OIDXdestroy(BAT *b);
ssize_t OIDfromStr(const char *src, size_t *len, oid **dst, bool external);
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -77,16 +77,15 @@ SQLhelp sqlhelp1[] = {
"ident,data_type",
"See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/SerialTypes"},
{"ALTER USER",
- "",
+ "Change a user's login name or password or default schema",
+ "ALTER USER ident RENAME TO ident\n"
+ "ALTER USER SET [ENCRYPTED | UNENCRYPTED] PASSWORD string USING OLD
PASSWORD string\n"
"ALTER USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string\n"
- "ALTER USER ident SET SCHEMA schemaname\n"
- "ALTER USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string SET
SCHEMA schemaname\n"
- "ALTER USER RENAME TO ident\n"
- "ALTER USER SET [ENCRYPTED | UNENCRYPTED] PASSWORD string USING OLD
PASSWORD string",
+ "ALTER USER ident [ WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string ]
SET SCHEMA ident",
"ident",
"See also https://www.monetdb.org/Documentation/SQLreference/Users"},
{"ANALYZE",
- "Collect column data statistics for optimizations",
+ "Collect column/table/schema data statistics for analysis and
optimizer usage",
"ANALYZE ident [ . ident [ column_list ] ] [SAMPLE size] [MINMAX]",
"column_list",
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/statistics"},
@@ -129,59 +128,59 @@ SQLhelp sqlhelp1[] = {
{"COPY LOADER",
"Copy into using a user supplied parsing function",
"COPY LOADER INTO qname FROM qname '(' [ scalar_expression ... ] ')'",
- "qname",
+ "qname,scalar_expression",
NULL},
{"CREATE AGGREGATE",
- "",
+ "Create a user-defined aggregate function. The body of the aggregate
function\n"
+ "can also be defined in other programming languages such as Python, R,
C or CPP.",
"CREATE [ OR REPLACE ] AGGREGATE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
" RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
" EXTERNAL NAME ident ',' ident\n"
"CREATE [ OR REPLACE ] AGGREGATE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
" RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
- " LANGUAGE ident external_code",
- "qname,param,data_type,function_return,ident",
- NULL},
+ " LANGUAGE language_keyword external_code",
+
"qname,param,data_type,function_return,ident,language_keyword,external_code",
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
{"CREATE FILTER FUNCTION",
"",
"CREATE [ OR REPLACE ] FILTER FUNCTION qname '(' { '*' | [ param [','
...]] } ')'\n"
" RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
" EXTERNAL NAME ident ',' ident",
- "param,data_type,function_return",
- NULL},
+ "qname,param,data_type,function_return,ident",
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
{"CREATE FUNCTION",
- "",
+ "Create a user-defined function. Besides standard SQL the body of the
function\n"
+ "can also be defined in other programming languages such as Python, R,
C or CPP.",
+ "CREATE [ OR REPLACE ] FUNCTION qname '(' { '*' | [ param [',' ...]] }
')'\n"
+ " RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
+ " BEGIN [ ATOMIC ] statement [ ';' ...] END\n"
"CREATE [ OR REPLACE ] FUNCTION qname '(' { '*' | [ param [',' ...]] }
')'\n"
" RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
" EXTERNAL NAME ident ',' ident\n"
"CREATE [ OR REPLACE ] FUNCTION qname '(' { '*' | [ param [',' ...]] }
')'\n"
" RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
- " BEGIN [ ATOMIC ] statement [ ';' ...] END\n"
- "CREATE [ OR REPLACE ] FUNCTION qname '(' { '*' | [ param [',' ...]] }
')'\n"
- " RETURNS { data_type | TABLE '(' function_return [',' ...] ')' }\n"
- " LANGUAGE ident external_code",
- "param,data_type,function_return,external_code",
- NULL},
+ " LANGUAGE language_keyword external_code",
+
"qname,param,data_type,function_return,statement,ident,language_keyword,external_code",
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Functions"},
{"CREATE INDEX",
"",
"CREATE [ UNIQUE | ORDERED | IMPRINTS ] INDEX ident ON qname '('
ident_list ')'",
NULL,
NULL},
{"CREATE PROCEDURE",
- "",
- "CREATE [ OR REPLACE ] PROCEDURE qname '(' { '*' | [ param [',' ...]]
} ')'\n"
- " EXTERNAL NAME ident ',' ident\n"
+ "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"
- " LANGUAGE ident external_code",
- "param,data_type,external_code",
- NULL},
+ " 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"
- " LANGUAGE ident external_code",
- "param,data_type,function_return,external_code",
- NULL},
+ " LANGUAGE PYTHON external_code",
+ "qname,param,external_code",
+ "See also
https://www.monetdb.org/blog/monetdbpython-loader-functions"},
{"CREATE MERGE TABLE",
"",
"CREATE MERGE TABLE [ IF NOT EXISTS ] qname table_source [
opt_partition_by ];",
@@ -198,15 +197,16 @@ SQLhelp sqlhelp1[] = {
NULL,
"See also
https://www.monetdb.org/Documentation/Cookbooks/SQLrecipes/TransactionReplication"},
{"CREATE ROLE",
- "",
+ "Create a new role. You can grant privileges to a role and next\n"
+ "grant a role (or multiple roles) to specific users",
"CREATE ROLE ident [ WITH ADMIN { CURRENT_USER | CURRENT_ROLE } ]",
"ident",
- NULL},
+ "See also https://www.monetdb.org/Documentation/SQLreference/Roles"},
{"CREATE SCHEMA",
"",
"CREATE SCHEMA [ IF NOT EXISTS ] schema_name [default_char_set]
[path_spec] [schema_element]",
"schema_name,default_char_set,path_spec,schema_element",
- NULL},
+ "See also https://www.monetdb.org/Documentation/SQLreference/Schema"},
{"CREATE SEQUENCE",
"Define a new sequence generator",
"CREATE SEQUENCE ident [ AS data_type] [ START [WITH start]]
[INCREMENT BY increment]\n"
@@ -224,13 +224,13 @@ SQLhelp sqlhelp1[] = {
"CREATE TABLE [ IF NOT EXISTS ] qname FROM LOADER function_ref\n"
"CREATE [ LOCAL | GLOBAL ] { TEMPORARY | TEMP } TABLE [ IF NOT EXISTS
] qname table_source [on_commit]",
"table_source,on_commit,function_ref",
- NULL},
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Tables"},
{"CREATE TRIGGER",
"",
"CREATE [ OR REPLACE ] TRIGGER qname { BEFORE | AFTER } { INSERT |
DELETE | TRUNCATE ...\n"
" | UPDATE [ OF ident [',' ident]] } ON qname REFERENCING
trigger_reference... triggered_action",
- "trigger_reference,triggered_action",
- NULL},
+ "qname,trigger_reference,triggered_action",
+ "See also
https://www.monetdb.org/Documentation/SQLreference/Triggers"},
{"CREATE TYPE",
"Add user defined type to the type system ",
"CREATE TYPE qname EXTERNAL NAME ident",
@@ -240,26 +240,41 @@ SQLhelp sqlhelp1[] = {
"Create a new user",
"CREATE USER ident WITH [ENCRYPTED | UNENCRYPTED] PASSWORD string NAME
string SCHEMA ident",
"ident",
- NULL},
+ "See also https://www.monetdb.org/Documentation/SQLreference/Users"},
{"CREATE VIEW",
"",
"CREATE [ OR REPLACE ] VIEW qname [ column_list ] AS {
query_expression | '(' query_expression ')' }\n"
"[ WITH CHECK OPTION ]",
- "column_list,query_expression",
- NULL},
+ "qname,column_list,query_expression",
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Views"},
{"CURRENT_DATE",
- "Built-in function",
- "CURRENT_DATE [ '(' ')']",
+ "Pseudo column or function to get the current date",
+ "CURRENT_DATE [ '(' ')' ]",
+ NULL,
+ NULL},
+ {"CURRENT_ROLE",
+ "Pseudo column to get the current role name",
+ "CURRENT_ROLE",
+ NULL,
+ NULL},
+ {"CURRENT_SCHEMA",
+ "Pseudo column to get the current schema name",
+ "CURRENT_SCHEMA",
NULL,
NULL},
{"CURRENT_TIME",
- "Built-in function",
- "CURRENT_TIME [ '(' ')']",
+ "Pseudo column or function to get the current time including timezone",
+ "CURRENT_TIME [ '(' ')' ]",
NULL,
NULL},
{"CURRENT_TIMESTAMP",
- "Built-in function",
- "CURRENT_TIMESTAMP [ '(' ')']",
+ "Pseudo column or function to get the current timestamp including
timezone",
+ "CURRENT_TIMESTAMP [ '(' ')' ] | NOW [ '(' ')' ]",
+ NULL,
+ NULL},
+ {"CURRENT_USER",
+ "Pseudo column to get the current user name",
+ "CURRENT_USER | USER",
NULL,
NULL},
{"EXPLAIN",
@@ -267,9 +282,14 @@ SQLhelp sqlhelp1[] = {
"EXPLAIN statement",
NULL,
"See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Explain"},
- {"LOCAL_TIMESTAMP",
- "Built-in function",
- "LOCAL_TIMESTAMP [ '(' ')']",
+ {"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},
{"EXTRACT",
@@ -610,7 +630,8 @@ SQLhelp sqlhelp2[] = {
NULL,
NULL},
{"ident",
- "An identifier",
+ "An identifier. Use double quote's around the identifier name to
include\n"
+ " mixed/upper case letters and/or special characters",
NULL,
NULL,
NULL},
@@ -639,6 +660,11 @@ SQLhelp sqlhelp2[] = {
"READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ | SERIALIZABLE",
NULL,
NULL},
+ {"language_keyword",
+ NULL,
+ "C | CPP | R | PYTHON | PYTHON_MAP | PYTHON2 | PYTHON2_MAP | PYTHON3 |
PYTHON3_MAP",
+ NULL,
+ NULL},
{"match_options",
NULL,
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
