Changeset: 649936c10219 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=649936c10219
Modified Files:
clients/mapiclient/dump.c
sql/scripts/97_comments.sql
sql/scripts/99_system.sql
sql/server/rel_schema.c
sql/server/sql_parser.y
sql/storage/store.c
Branch: comment-on
Log Message:
Remove some trailing whitespace
diffs (122 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -708,7 +708,7 @@ dump_column_definition(Mapi mid, stream
mnstr_printf(toConsole, "%*s DEFAULT %s",
CAP(13 - space), "", c_default);
- if (schema && tname)
+ if (schema && tname)
append_comment(comments, "COLUMN", schema, tname,
c_name, NULL, c_remark);
cnt++;
if (mnstr_errnr(toConsole))
@@ -1195,7 +1195,7 @@ describe_schema(Mapi mid, const char *sn
}
write_comment_buffer(toConsole, comments);
- comment_buffer_destroy(comments);
+ comment_buffer_destroy(comments);
return 0;
}
diff --git a/sql/scripts/97_comments.sql b/sql/scripts/97_comments.sql
--- a/sql/scripts/97_comments.sql
+++ b/sql/scripts/97_comments.sql
@@ -32,7 +32,7 @@ END;
CREATE TABLE systemfunctions (function_id INTEGER NOT NULL);
GRANT SELECT ON systemfunctions TO PUBLIC;
-CREATE FUNCTION sys.function_type_keyword(ftype INT)
+CREATE FUNCTION sys.function_type_keyword(ftype INT)
RETURNS VARCHAR(20)
BEGIN
RETURN CASE ftype
@@ -51,14 +51,14 @@ RETURNS TABLE (
sname VARCHAR(1024),
name VARCHAR(1024),
fullname VARCHAR(1024),
- ntype INTEGER, -- must match the MD_TABLE/VIEW/SEQ/FUNC/SCHEMA
constants in mclient.c
+ ntype INTEGER, -- must match the MD_TABLE/VIEW/SEQ/FUNC/SCHEMA
constants in mclient.c
type VARCHAR(30),
system BOOLEAN,
remark VARCHAR(65000)
)
BEGIN
RETURN TABLE (
- WITH
+ WITH
table_data AS (
SELECT schema_id AS sid,
id,
@@ -109,7 +109,7 @@ BEGIN
SELECT * FROM schema_data
)
--
- SELECT DISTINCT
+ SELECT DISTINCT
s.name AS sname,
a.name AS name,
COALESCE(s.name || '.', '') || a.name AS fullname,
@@ -117,7 +117,7 @@ BEGIN
(CASE WHEN a.system THEN 'SYSTEM ' ELSE '' END) || a.type
AS type,
a.system AS system,
c.remark AS remark
- FROM all_data a
+ FROM all_data a
LEFT OUTER JOIN sys.schemas s ON a.sid = s.id
LEFT OUTER JOIN sys.comments c ON a.id = c.id
ORDER BY system, name, fullname, ntype
diff --git a/sql/scripts/99_system.sql b/sql/scripts/99_system.sql
--- a/sql/scripts/99_system.sql
+++ b/sql/scripts/99_system.sql
@@ -7,8 +7,8 @@
-- only system functions until now
insert into systemfunctions select id from functions;
-create trigger system_update_schemas after update on sys.schemas for each
statement call sys_update_schemas();
-create trigger system_update_tables after update on sys._tables for each
statement call sys_update_tables();
+create trigger system_update_schemas after update on sys.schemas for each
statement call sys_update_schemas();
+create trigger system_update_tables after update on sys._tables for each
statement call sys_update_tables();
-- only system tables until now
update _tables set system = true;
diff --git a/sql/server/rel_schema.c b/sql/server/rel_schema.c
--- a/sql/server/rel_schema.c
+++ b/sql/server/rel_schema.c
@@ -2194,7 +2194,7 @@ rel_comment_on(mvc *sql, sqlid obj_id, s
if (!mvc_schema_privs(sql, schema)) {
return sql_error(sql, 02, SQLSTATE(42000) "COMMENT ON:
insufficient privileges for user '%s' in schema '%s'", stack_get_string(sql,
"current_user"), schema->base.name);
}
-
+
buf = buffer_create(4000);
if (!buf)
goto wrap_up;
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
@@ -592,7 +592,7 @@ SQLCODE SQLERROR UNDER WHENEVER
%token<sval> ASC DESC AUTHORIZATION
%token CHECK CONSTRAINT CREATE COMMENT
%token TYPE PROCEDURE FUNCTION sqlLOADER AGGREGATE RETURNS EXTERNAL sqlNAME
DECLARE
-%token CALL LANGUAGE
+%token CALL LANGUAGE
%token ANALYZE MINMAX SQL_EXPLAIN SQL_PLAN SQL_DEBUG SQL_TRACE PREP PREPARE
EXEC EXECUTE
%token DEFAULT DISTINCT DROP
%token FOREIGN
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -3835,10 +3835,10 @@ sys_drop_sequence(sql_trans *tr, sql_seq
table_funcs.table_delete(tr, sysseqs, rid);
sql_trans_drop_dependencies(tr, seq->base.id);
sql_trans_drop_any_comment(tr, seq->base.id);
-
+
if (drop_action)
sql_trans_drop_all_dependencies(tr, seq->s, seq->base.id,
SEQ_DEPENDENCY);
-
+
}
static void
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
