Changeset: cae823a96dfb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cae823a96dfb
Modified Files:
clients/mapiclient/mhelp.c
Branch: Aug2018
Log Message:
Corrected and extended mclient SQL help, such as missing data types: BOOLEAN,
NUMERIC, JSON, URL, INET and UUID.
diffs (183 lines):
diff --git a/clients/mapiclient/mhelp.c b/clients/mapiclient/mhelp.c
--- a/clients/mapiclient/mhelp.c
+++ b/clients/mapiclient/mhelp.c
@@ -267,7 +267,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"DELETE",
"",
- "[ WITH with_list] DELETE FROM qname [WHERE search_condition]",
+ "[ WITH with_list ] DELETE FROM qname [ WHERE search_condition ]",
"with_list,search_condition",
NULL},
{"DROP AGGREGATE",
@@ -348,7 +348,7 @@ SQLhelp sqlhelp[] = {
"See also
https://www.monetdb.org/Documentation/SQLreference/Flowofcontrol"},
{"INSERT",
"",
- "[WITH with_list ] INSERT INTO qname [ column_list ] [ DEFAULT VALUES
| VALUES row_values | query_expression]",
+ "[ WITH with_list ] INSERT INTO qname [ column_list ] { DEFAULT VALUES
| VALUES row_values | query_expression }",
"with_list,column_list,row_values,query_expression",
"See also https://www.monetdb.org/Documentation/SQLreference/Updates"},
{"GRANT",
@@ -422,7 +422,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"SET SESSION AUTHORIZATION",
"",
- "SESSION AUTHORIZATIO ident",
+ "SET SESSION AUTHORIZATION ident",
NULL,
NULL},
{"SET TIME ZONE",
@@ -454,9 +454,9 @@ SQLhelp sqlhelp[] = {
"",
"'(' joined_table ') |\n"
"table_ref CROSS JOIN table_ref ')' |\n"
- "table_ref NATURAL [ INNER | LEFT | RIGHT | FULL] JOIN table_ref |\n"
+ "table_ref NATURAL [ INNER | LEFT | RIGHT | FULL ] JOIN table_ref |\n"
"table_ref UNION JOIN table_ref { ON search_condition | USING
column_list } |\n"
- "table_ref [ INNER | LEFT | RIGHT | FULL] JOIN table_ref { ON
search_condition | USING column_list } |\n",
+ "table_ref [ INNER | LEFT | RIGHT | FULL ] JOIN table_ref { ON
search_condition | USING column_list }",
NULL,
"See also
https://www.monetdb.org/Documentation/SQLreference/TableExpressions"},
{"TRACE",
@@ -471,8 +471,8 @@ SQLhelp sqlhelp[] = {
NULL},
{"UPDATE",
"",
- "[WITH with_list] UPDATE qname SET assignment_list [FROM from_clause]
[WHERE search_condition]",
- "with_list,assignment_list,from_clause,search_condition",
+ "[ WITH with_list ] UPDATE qname SET assignment_list [ WHERE
search_condition ]",
+ "with_list,assignment_list,search_condition",
NULL},
{"WHILE",
"",
@@ -505,8 +505,8 @@ SQLhelp sqlhelp[] = {
NULL},
{"column_def",
NULL,
- "COLUMN [ SERIAL | BIGSERIAL ] | COLUMN data_type [ column_option
...]",
- "column_option",
+ "COLUMN { data_type [ column_option ... ] | SERIAL | BIGSERIAL }",
+ "data_type,column_option",
NULL},
{"column_list",
NULL,
@@ -515,7 +515,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"column_option",
NULL,
- "DEFAULT value | column_constraint |generated_column",
+ "DEFAULT value | column_constraint | generated_column",
"column_constraint,generated_column",
NULL},
{"column_option_list",
@@ -525,10 +525,10 @@ SQLhelp sqlhelp[] = {
NULL},
{"column_constraint",
NULL,
- "[ [ NOT] NULL | UNIQUE | PRIMARY KEY | CHECK '(' search_condition
')'\n"
- "| REFERENCES qname [ column_list ][ MATCH [ FULL | PARTIAL | SIMPLE]]
reference_action ...\n",
- "reference_action",
- NULL},
+ "NULL | NOT NULL | UNIQUE | PRIMARY KEY | CHECK '(' search_condition
')' |\n"
+ " REFERENCES qname [ column_list ] [ MATCH {FULL|PARTIAL|SIMPLE} ]
reference_action ...\n",
+ "search_condition,reference_action",
+ "See also
https://www.monetdb.org/Documentation/SQLreference/TableIdentityColumn"},
{"control_statement",
NULL,
"call_procedure | while_statement | if_statement | case_statement |
return_statement",
@@ -536,16 +536,21 @@ SQLhelp sqlhelp[] = {
NULL},
{"datetime_type",
NULL,
- "DATE | TIME [ time_precision ] tz | TIMESTAMP [ timestamp_precision ]
tz",
- "time_precision,timestamp_precision,tz",
- NULL},
+ "DATE | TIME [ time_precision ] [ WITH TIME ZONE ] |\n"
+ " TIMESTAMP [ timestamp_precision ] [ WITH TIME ZONE ]",
+ "time_precision,timestamp_precision",
+ "See also
https://www.monetdb.org/Documentation/SQLreference/Temporal"},
{"data_type",
NULL,
- "[ [ CHAR[ACTER] | VARCHAR | CLOB | TEXT | BLOB] [ '(' nonzero ')' ]
|\n"
- "TINYINT | SMALLINT | INT[EGER] | BIGINT | HUGEINT | [ DECIMAL |
FLOAT] [ '(' nonzero [',' nonzero ] ')'] |\n"
- " DOUBLE [ PRECISION ] | REAL | datetime_type | interval_type |
geometry_type",
+ "BOOLEAN | BOOL | TINYINT | SMALLINT | INT | INTEGER | BIGINT |
HUGEINT |\n"
+ " { DECIMAL | DEC | NUMERIC | FLOAT } [ '(' nonzero [',' nonzero ] ')'
] |\n"
+ " REAL | DOUBLE [ PRECISION ] |\n"
+ " { VARCHAR | CHARARCTER VARYING } '(' nonzero ')' |\n"
+ " { CHAR | CHARACTER [ LARGE OBJECT ] | CLOB | TEXT | STRING | JSON |
URL } [ '(' nonzero ')' ] |\n"
+ " { BINARY LARGE OBJECT | BLOB } [ '(' nonzero ')' ] |\n"
+ " UUID | INET | datetime_type | interval_type | geometry_type",
"datetime_type,interval_type,geometry_type",
- NULL},
+ "See also
https://www.monetdb.org/Documentation/Manuals/SQLreference/Datatypes"},
{"default_char_set",
NULL,
"DEFAULT CHARACTER SET ident",
@@ -553,7 +558,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"drop_table_element",
NULL,
- "{ CONSTRAINT | TABLE | COLUMN | } ident [ { RESTRICT | CASCADE } ]",
+ "{ CONSTRAINT | TABLE | COLUMN } ident [ { RESTRICT | CASCADE } ]",
NULL,
NULL},
{"end_time",
@@ -600,7 +605,12 @@ SQLhelp sqlhelp[] = {
{"interval",
NULL,
"INTERVAL [ '+' | '-' ] string start_field TO end_field",
- "start_field,end_time",
+ "start_field,end_field",
+ NULL},
+ {"interval_type",
+ NULL,
+ "INTERVAL { YEAR | MONTH | DAY | HOUR | MINUTE | SECOND
[time_precision] | start_field TO end_field }",
+ "time_precision,start_field,end_field",
NULL},
{"intval",
"Integer value",
@@ -680,9 +690,10 @@ SQLhelp sqlhelp[] = {
NULL,},
{"table_constraint",
NULL,
- "CONSTRAINT [ ident ] { UNIQUE | PRIMARY KEY } column_list | FOREIGN
KEY } column_list REFERENCES qname [ column_list ][ MATCH [ FULL | PARTIAL |
SIMPLE]]",
- NULL,
- NULL},
+ "CONSTRAINT [ ident ] { PRIMARY KEY column_list | UNIQUE column_list
|\n"
+ " FOREIGN KEY column_list REFERENCES qname [ column_list ] [ MATCH
{FULL|PARTIAL|SIMPLE} ] }",
+ "column_list",
+ "See also
https://www.monetdb.org/Documentation/SQLreference/TableIdentityColumn"},
{"table_element",
NULL,
"column_def | table_constraint | column_option_list | LIKE qname",
@@ -701,7 +712,7 @@ SQLhelp sqlhelp[] = {
{"table_source",
NULL,
"'(' table_element [ ',' ... ] ')' | column_list AS query_expression [
WITH [NO] DATA ] ",
- "table_element",
+ "table_element,column_list,query_expression",
NULL},
{"transaction_statement",
NULL,
@@ -710,7 +721,7 @@ SQLhelp sqlhelp[] = {
NULL},
{"time_precision",
NULL,
- "'(' YEAR | MONTH | DAY | HOUR | MINUTE ')'",
+ "'(' integer ')'",
NULL,
NULL},
{"timestamp_precision",
@@ -751,8 +762,8 @@ SQLhelp sqlhelp[] = {
NULL},
{"with_list",
NULL,
- "ident [ column_list] AS [',' with_list]...",
- NULL,
+ "ident [ column_list ] AS query_expression [ ',' with_list ] ...",
+ "column_list,query_expression",
NULL},
{NULL, NULL, NULL, NULL, NULL} /* End of list marker */
};
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
