Changeset: 394afc45ff7d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/394afc45ff7d
Modified Files:
sql/scripts/52_describe.sql
sql/scripts/76_dump.sql
Branch: Jul2021
Log Message:
Some more identation fixes
diffs (66 lines):
diff --git a/sql/scripts/52_describe.sql b/sql/scripts/52_describe.sql
--- a/sql/scripts/52_describe.sql
+++ b/sql/scripts/52_describe.sql
@@ -537,11 +537,11 @@ END;
CREATE FUNCTION sys.describe_function(schemaName string, functionName string)
RETURNS TABLE(id integer, name string, type string, language string,
remark string)
BEGIN
- RETURN SELECT f.id, f.name, ft.function_type_keyword, fl.language_keyword,
c.remark
- FROM sys.functions f
- JOIN sys.schemas s ON f.schema_id = s.id
- JOIN sys.function_types ft ON f.type = ft.function_type_id
- LEFT OUTER JOIN sys.function_languages fl ON f.language =
fl.language_id
- LEFT OUTER JOIN sys.comments c ON f.id = c.id
- WHERE f.name=functionName AND s.name = schemaName;
+ RETURN SELECT f.id, f.name, ft.function_type_keyword,
fl.language_keyword, c.remark
+ FROM sys.functions f
+ JOIN sys.schemas s ON f.schema_id = s.id
+ JOIN sys.function_types ft ON f.type = ft.function_type_id
+ LEFT OUTER JOIN sys.function_languages fl ON f.language =
fl.language_id
+ LEFT OUTER JOIN sys.comments c ON f.id = c.id
+ WHERE f.name=functionName AND s.name = schemaName;
END;
diff --git a/sql/scripts/76_dump.sql b/sql/scripts/76_dump.sql
--- a/sql/scripts/76_dump.sql
+++ b/sql/scripts/76_dump.sql
@@ -145,13 +145,13 @@ CREATE FUNCTION sys.esc(s STRING) RETURN
CREATE FUNCTION sys.prepare_esc(s STRING, t STRING) RETURNS STRING
BEGIN
- RETURN
- CASE
- WHEN (t = 'varchar' OR t ='char' OR t = 'clob' OR t = 'json' OR t
= 'geometry' OR t = 'url') THEN
- 'CASE WHEN ' || sys.DQ(s) || ' IS NULL THEN ''null'' ELSE ' ||
'sys.esc(' || sys.DQ(s) || ')' || ' END'
- ELSE
- 'CASE WHEN ' || sys.DQ(s) || ' IS NULL THEN ''null'' ELSE
CAST(' || sys.DQ(s) || ' AS STRING) END'
- END;
+RETURN
+ CASE
+ WHEN (t = 'varchar' OR t ='char' OR t = 'clob' OR t = 'json' OR
t = 'geometry' OR t = 'url') THEN
+ 'CASE WHEN ' || sys.DQ(s) || ' IS NULL THEN ''null''
ELSE ' || 'sys.esc(' || sys.DQ(s) || ')' || ' END'
+ ELSE
+ 'CASE WHEN ' || sys.DQ(s) || ' IS NULL THEN ''null''
ELSE CAST(' || sys.DQ(s) || ' AS STRING) END'
+ END;
END;
--The dump statement should normally have an auto-incremented column
representing the creation order.
@@ -163,8 +163,8 @@ CREATE TABLE sys.dump_statements(o INT,
CREATE PROCEDURE sys._dump_table_data(sch STRING, tbl STRING) BEGIN
- DECLARE k INT;
- SET k = (SELECT MIN(c.id) FROM sys.columns c, sys.tables t WHERE
c.table_id = t.id AND t.name = tbl);
+ DECLARE k INT;
+ SET k = (SELECT MIN(c.id) FROM sys.columns c, sys.tables t WHERE
c.table_id = t.id AND t.name = tbl);
IF k IS NOT NULL THEN
DECLARE cname STRING;
@@ -206,7 +206,7 @@ END;
CREATE PROCEDURE sys.dump_table_data() BEGIN
DECLARE i INT;
- SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
+ SET i = (SELECT MIN(t.id) FROM sys.tables t, sys.table_types ts WHERE
t.type = ts.table_type_id AND ts.table_type_name = 'TABLE' AND NOT t.system);
IF i IS NOT NULL THEN
DECLARE M INT;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
