Changeset: 8a962fd6c7c9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8a962fd6c7c9
Branch: txtsim-imp
Log Message:
Merge with Jun2023.
diffs (82 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -111,23 +111,32 @@ SQLhelp sqlhelp1[] = {
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/transactions/"},
{"COPY BINARY",
"Append binary representations into a table",
- "COPY [( BIG | LITTLE | NATIVE) ENDIAN] BINARY INTO qname
[column_list] FROM string [',' ...] [ON { CLIENT | SERVER }]",
+ "COPY [{BIG | LITTLE | NATIVE} ENDIAN] BINARY INTO qname [column_list]
FROM string [',' ...] [ON { CLIENT | SERVER }]",
"qname,column_list",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/binary-loading/"},
{"COPY INTO",
- "Parse a csv file into a table or write a query result to a csv file",
+ "Write query result data to a csv file or standard output stream",
+ "COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]]
[separators] [NULL [AS] string]",
+ "query_expression,separators",
+ "See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/export_data/"},
+ {"COPY INTO BINARY",
+ "Write query result data to binary files",
+ "COPY query_expression INTO [{{BIG | LITTLE | NATIVE}} ENDIAN] BINARY
string_commalist [ON { CLIENT | SERVER }]",
+ "query_expression",
+ "See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/export_data/"},
+ {"COPY INTO FROM",
+ "Read csv file(s) or standard input stream data and insert into a
table",
"COPY [nrofrecords] INTO qname [column_list] FROM string [',' ...]
[headerlist] [ON { CLIENT | SERVER }] [ separators]\n"
" [NULL [AS] string] [BEST EFFORT] [FWF '(' integer [',' ...] ')'\n"
"COPY [nrofrecords] INTO qname [column_list] FROM STDIN [headerlist] [
separators]\n"
- " [NULL [AS] string] [BEST EFFORT]\n"
- "COPY query_expression INTO [STDOUT | string [ON { CLIENT | SERVER }]]
[separators] [NULL [AS] string]",
+ " [NULL [AS] string] [BEST EFFORT]\n",
"nrofrecords,qname,column_list,headerlist,separators",
"See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/copy-from/"},
{"COPY LOADER",
"Copy into using a user supplied parsing function",
"COPY LOADER INTO qname FROM qname '(' [ scalar_expression ... ] ')'",
"qname,scalar_expression",
- NULL},
+ "See also
https://www.monetdb.org/documentation/user-guide/sql-manual/data-loading/loader-functions/"},
{"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.",
@@ -228,8 +237,8 @@ SQLhelp sqlhelp1[] = {
{"CREATE TRIGGER",
"Define a triggered action for a table data update event",
"CREATE [ OR REPLACE ] TRIGGER ident { BEFORE | AFTER }\n"
- " { INSERT | DELETE | TRUNCATE | UPDATE [ OF ident_list ] }\n"
- " ON qname [ REFERENCING trigger_reference [...] ] triggered_action",
+ " { INSERT | DELETE | TRUNCATE | UPDATE [ OF ident_list ] | LOGIN }\n"
+ " [ ON qname ] [ REFERENCING trigger_reference [...] ]
triggered_action",
"qname,ident_list,trigger_reference,triggered_action",
"See also
https://www.monetdb.org/documentation/user-guide/sql-programming/trigger-definition/"},
{"CREATE TYPE",
@@ -950,7 +959,7 @@ SQLhelp sqlhelp2[] = {
NULL},
{"triggered_action",
NULL,
- "[ FOR [EACH] { ROW | STATEMENT } ]\n"
+ "[ FOR EACH { ROW | STATEMENT } ]\n"
"[ WHEN '(' search_condition ')' ]\n"
"{ trigger_statement | BEGIN ATOMIC trigger_statement [ ; ... ] END }",
"trigger_statement,search_condition",
diff --git a/sql/ChangeLog.Jun2023 b/sql/ChangeLog.Jun2023
--- a/sql/ChangeLog.Jun2023
+++ b/sql/ChangeLog.Jun2023
@@ -2,7 +2,7 @@
# This file is updated with Maddlog
* Fri Apr 7 2023 Lucas Pereira <[email protected]>
-- Session timeout feature improve to start evaluating from the moment
+- Session timeout feature improvement to start evaluating from the moment
the procedure is called, instead of beginning of the session.
* Fri Mar 3 2023 Lucas Pereira <[email protected]>
@@ -40,7 +40,7 @@
* Fri Sep 30 2022 Joeri van Ruth <[email protected]>
- When loading data using COPY BINARY INTO, apply default values instead of
just
inserting NULLs.
-- When loading data using COPY BINARY INTO, validate DECIMAL(n,k) and
+- When loading data using COPY BINARY INTO, validate DECIMAL(prec,scale) and
VARCHAR(n) column width.
- When loading data using COPY BINARY INTO, string used to have their line
endings converted from CR LF to LF. Do not do this, it is the responsibility
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
