Changeset: bf17b6448dbb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bf17b6448dbb
Modified Files:
sql/server/rel_semantic.c
sql/server/rel_updates.c
sql/server/sql_parser.y
sql/server/sql_tokens.h
Branch: copyintobinary
Log Message:
Rename SQL_(BIN)COPYTO to SQL_(BIN)COPYINTO
Reduce cognitive load by a tiny bit
diffs (105 lines):
diff --git a/sql/server/rel_semantic.c b/sql/server/rel_semantic.c
--- a/sql/server/rel_semantic.c
+++ b/sql/server/rel_semantic.c
@@ -178,9 +178,9 @@ rel_semantic(sql_query *query, symbol *s
case SQL_TRUNCATE:
case SQL_MERGE:
case SQL_COPYFROM:
- case SQL_COPYTO:
+ case SQL_COPYINTO:
case SQL_BINCOPYFROM:
- case SQL_BINCOPYTO:
+ case SQL_BINCOPYINTO:
case SQL_COPYLOADER:
return rel_updates(query, s);
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -2097,7 +2097,7 @@ rel_updates(sql_query *query, symbol *s)
sql->type = Q_SCHEMA;
}
break;
- case SQL_COPYTO:
+ case SQL_COPYINTO:
{
dlist *l = s->data.lval;
@@ -2105,7 +2105,7 @@ rel_updates(sql_query *query, symbol *s)
sql->type = Q_UPDATE;
}
break;
- case SQL_BINCOPYTO:
+ case SQL_BINCOPYINTO:
{
dlist *l = s->data.lval;
symbol *qry = l->h->data.sym;
diff --git a/sql/server/sql_parser.y b/sql/server/sql_parser.y
--- a/sql/server/sql_parser.y
+++ b/sql/server/sql_parser.y
@@ -2850,7 +2850,7 @@ copyto_stmt:
append_list(l, $6);
append_string(l, $7);
append_int(l, $5);
- $$ = _symbol_create_list( SQL_COPYTO, l ); }
+ $$ = _symbol_create_list( SQL_COPYINTO, l ); }
// 1 2 3 4 5 6
| COPY query_expression_def INTO STDOUT opt_seps opt_null_string
{ dlist *l = L();
@@ -2859,7 +2859,7 @@ copyto_stmt:
append_list(l, $5);
append_string(l, $6);
append_int(l, 0);
- $$ = _symbol_create_list( SQL_COPYTO, l ); }
+ $$ = _symbol_create_list( SQL_COPYINTO, l ); }
// 1 2 3 4 5 6 7
| COPY query_expression_def INTO opt_endianness BINARY string_commalist
opt_on_location
{ dlist *l = L();
@@ -2867,7 +2867,7 @@ copyto_stmt:
append_int(l, $4);
append_list(l, $6);
append_int(l, $7);
- $$ = _symbol_create_list( SQL_BINCOPYTO, l ); }
+ $$ = _symbol_create_list( SQL_BINCOPYINTO, l ); }
;
opt_fwf_widths:
@@ -6303,7 +6303,7 @@ char *token2string(tokens token)
SQL(ATOM);
SQL(BETWEEN);
SQL(BINCOPYFROM);
- SQL(BINCOPYTO);
+ SQL(BINCOPYINTO);
SQL(BINOP);
SQL(CACHE);
SQL(CALL);
@@ -6320,7 +6320,7 @@ char *token2string(tokens token)
SQL(CONSTRAINT);
SQL(COPYFROM);
SQL(COPYLOADER);
- SQL(COPYTO);
+ SQL(COPYINTO);
SQL(CREATE_FUNC);
SQL(CREATE_INDEX);
SQL(CREATE_ROLE);
diff --git a/sql/server/sql_tokens.h b/sql/server/sql_tokens.h
--- a/sql/server/sql_tokens.h
+++ b/sql/server/sql_tokens.h
@@ -21,7 +21,7 @@ typedef enum tokens {
SQL_ATOM,
SQL_BETWEEN,
SQL_BINCOPYFROM,
- SQL_BINCOPYTO,
+ SQL_BINCOPYINTO,
SQL_BINOP,
SQL_CACHE,
SQL_CALL,
@@ -38,7 +38,7 @@ typedef enum tokens {
SQL_CONSTRAINT,
SQL_COPYFROM,
SQL_COPYLOADER,
- SQL_COPYTO,
+ SQL_COPYINTO,
SQL_CREATE_FUNC,
SQL_CREATE_INDEX,
SQL_CREATE_ROLE,
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
