Changeset: 8ab268ac3c4f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8ab268ac3c4f
Modified Files:
sql/test/emptydb/Tests/check.SQL.py
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:
Remove some redundant tests.
diffs (truncated from 16599 to 300 lines):
diff --git a/sql/test/emptydb/Tests/check.SQL.py
b/sql/test/emptydb/Tests/check.SQL.py
--- a/sql/test/emptydb/Tests/check.SQL.py
+++ b/sql/test/emptydb/Tests/check.SQL.py
@@ -373,60 +373,6 @@ sys_notnull = [
('value_partitions', 'value'),
]
-with process.client('sql', format='csv', echo=False,
- stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as clt:
-
- for c in 'ntvsf':
- clt.stdin.write("select E'\\\\d%s';\n" % c)
-
- for c in 'ntvsf':
- clt.stdin.write("select E'\\\\dS%s';\n" % c)
-
- clt.stdin.write("select E'\\\\dn ' || name from sys.schemas order by
name;\n")
-
- clt.stdin.write("select E'\\\\dSt ' || s.name || '.' || t.name from
sys._tables t, sys.schemas s where t.schema_id = s.id and t.query is null order
by s.name, t.name;\n")
-
- out, err = clt.communicate()
- out = re.sub('^"(.*)"$', r'\1', out, flags=re.MULTILINE).replace('"\n',
'\n').replace('\n"', '\n').replace('""', '"').replace(r'\\', '\\')
-
- output.append(out)
- sys.stderr.write(err)
- if err:
- xit = 1
-
-with process.client('sql', interactive=True,
- stdin=process.PIPE, stdout=process.PIPE,
stderr=process.PIPE) as clt:
-
- out, err = clt.communicate(out)
-
- # do some normalization of the output:
- # remove SQL comments and empty lines
- out = re.sub('^[ \t]*(?:--.*)?\n', '', out, flags=re.MULTILINE)
- out = re.sub('[\t ]*--.*', '', out)
- out = re.sub(r'/\*.*?\*/[\n\t ]*', '', out, flags=re.DOTALL)
-
- wsre = re.compile('[\n\t ]+')
- pos = 0
- nout = ''
- for res in re.finditer(r'\bbegin\b.*?\bend\b[\n\t ]*;', out,
flags=re.DOTALL | re.IGNORECASE):
- nout += out[pos:res.start(0)] + wsre.sub(' ', res.group(0)).replace('(
', '(').replace(' )', ')')
- pos = res.end(0)
- nout += out[pos:]
- out = nout
-
- pos = 0
- nout = ''
- for res in
re.finditer(r"(?<=\n)(?:create|select)\b[^';]*(?:'[^\']*(?:\\.[^\']*)*'[^';]*)*;",
out, flags=re.DOTALL | re.IGNORECASE):
- nout += out[pos:res.start(0)] + wsre.sub(' ', res.group(0)).replace('(
', '(').replace(' )', ')')
- pos = res.end(0)
- nout += out[pos:]
- out = nout
-
- output.append(out)
- sys.stderr.write(err)
- if err:
- xit = 1
-
# add queries to dump the system tables, but avoid dumping IDs since
# they are too volatile, and if it makes sense, dump an identifier
# from a referenced table
@@ -434,11 +380,11 @@ out = r'''
-- helper function
create function pcre_replace(origin string, pat string, repl string, flags
string) returns string external name pcre.replace;
-- schemas
-select 'sys.schemas', s.name, a1.name as authorization, a2.name as owner,
system from sys.schemas s left outer join sys.auths a1 on s.authorization =
a1.id left outer join sys.auths a2 on s.owner = a2.id order by s.name;
+select 'sys.schemas', s.name, a1.name as authorization, a2.name as owner,
system, c.remark as comment from sys.schemas s left outer join sys.auths a1 on
s.authorization = a1.id left outer join sys.auths a2 on s.owner = a2.id left
outer join sys.comments c on c.id = s.id order by s.name;
-- _tables
-select 'sys._tables', s.name, t.name,
replace(replace(pcre_replace(pcre_replace(t.query, E'--.*\n*', '', ''), E'[
\t\n]+', ' ', ''), '( ', '('), ' )', ')') as query, tt.table_type_name as type,
t.system, ca.action_name as commit_action, at.value as access from sys._tables
t left outer join sys.schemas s on t.schema_id = s.id left outer join
sys.table_types tt on t.type = tt.table_type_id left outer join (values (0,
'COMMIT'), (1, 'DELETE'), (2, 'PRESERVE'), (3, 'DROP'), (4, 'ABORT')) as ca
(action_id, action_name) on t.commit_action = ca.action_id left outer join
(values (0, 'WRITABLE'), (1, 'READONLY'), (2, 'APPENDONLY')) as at (id, value)
on t.access = at.id order by s.name, t.name;
+select 'sys._tables', s.name, t.name,
replace(replace(pcre_replace(pcre_replace(t.query, E'--.*\n*', '', ''), E'[
\t\n]+', ' ', ''), '( ', '('), ' )', ')') as query, tt.table_type_name as type,
t.system, ca.action_name as commit_action, at.value as access, c.remark as
comment from sys._tables t left outer join sys.schemas s on t.schema_id = s.id
left outer join sys.table_types tt on t.type = tt.table_type_id left outer join
(values (0, 'COMMIT'), (1, 'DELETE'), (2, 'PRESERVE'), (3, 'DROP'), (4,
'ABORT')) as ca (action_id, action_name) on t.commit_action = ca.action_id left
outer join (values (0, 'WRITABLE'), (1, 'READONLY'), (2, 'APPENDONLY')) as at
(id, value) on t.access = at.id left outer join sys.comments c on c.id = t.id
order by s.name, t.name;
-- _columns
-select 'sys._columns', t.name, c.name, c.type, c.type_digits, c.type_scale,
c."default", c."null", c.number, c.storage from sys._tables t, sys._columns c
where t.id = c.table_id order by t.name, c.number;
+select 'sys._columns', t.name, c.name, c.type, c.type_digits, c.type_scale,
c."default", c."null", c.number, c.storage, r.remark as comment from
sys._tables t, sys._columns c left outer join sys.comments r on r.id = c.id
where t.id = c.table_id order by t.name, c.number;
-- partitioned tables (these three should be empty)
select 'sys.table_partitions', t.name, c.name, p.expression from
sys.table_partitions p left outer join sys._tables t on p.table_id = t.id left
outer join sys._columns c on p.column_id = c.id;
select 'sys.range_partitions', t.name, p.expression, r.minimum, r.maximum,
r.with_nulls from sys.range_partitions r left outer join sys._tables t on t.id
= r.table_id left outer join sys.table_partitions p on r.partition_id = p.id;
@@ -457,7 +403,7 @@ MAXARGS = 16
# columns of the args table we're interested in
args = ['name', 'type', 'type_digits', 'type_scale', 'inout']
-out += r"select 'sys.functions', s.name, f.name, case f.system when true then
'SYSTEM' else '' end as system,
replace(replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func,
E'--.*\n', '', ''), E'[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )',
')'), 'create system ', 'create ') as query, f.mod, fl.language_name,
ft.function_type_name as func_type, f.side_effect, f.varres, f.vararg,
f.semantics"
+out += r"select 'sys.functions', s.name, f.name, case f.system when true then
'SYSTEM' else '' end as system,
replace(replace(replace(pcre_replace(pcre_replace(pcre_replace(f.func,
E'--.*\n', '', ''), E'[ \t\n]+', ' ', 'm'), '^ ', '', ''), '( ', '('), ' )',
')'), 'create system ', 'create ') as query, f.mod, fl.language_name,
ft.function_type_name as func_type, f.side_effect, f.varres, f.vararg,
f.semantics, c.remark as comment"
for i in range(0, MAXARGS):
for a in args[:-1]:
out += ", a%d.%s as %s%d" % (i, a, a, i)
@@ -466,6 +412,7 @@ out += " from sys.functions f"
out += " left outer join sys.schemas s on f.schema_id = s.id"
out += " left outer join sys.function_types as ft on f.type =
ft.function_type_id"
out += " left outer join sys.function_languages fl on f.language =
fl.language_id"
+out += " left outer join sys.comments c on c.id = f.id"
for i in range(0, MAXARGS):
out += " left outer join sys.args a%d on a%d.func_id = f.id and a%d.number
= %d" % (i, i, i, i)
out += " order by s.name, f.name, query, func_type"
@@ -477,13 +424,6 @@ out += ";"
out += '''
-- auths
select 'sys.auths', name, grantor from sys.auths;
--- comments
-select 'schema comments', s.name, c.remark from sys.comments c, sys.schemas s
where s.id = c.id order by s.name;
-select 'table comments', s.name, t.name, c.remark from sys.schemas s,
sys._tables t, sys.comments c where s.id = t.schema_id and t.id = c.id order by
s.name, t.name;
-select 'column comments', s.name, t.name, col.name, c.remark from sys.schemas
s, sys._tables t, sys._columns col, sys.comments c where s.id = t.schema_id and
t.id = col.table_id and col.id = c.id order by s.name, t.name, col.name;
-select 'index comments', s.name, t.name, i.name, c.remark from sys.schemas s,
sys._tables t, sys.idxs i, sys.comments c where s.id = t.schema_id and t.id =
i.table_id and i.id = c.id order by s.name, t.name, i.name;
-select 'sequence comments', s.name, q.name, c.remark from sys.schemas s,
sys.sequences q, sys.comments c where s.id = q.schema_id and q.id = c.id order
by s.name, q.name;
-select 'function comments', s.name, f.name, c.remark from sys.schemas s,
sys.functions f, sys.comments c where s.id = f.schema_id and f.id = c.id order
by s.name, f.name;
-- db_user_info
select 'sys.db_user_info', u.name, u.fullname, s.name from sys.db_user_info u
left outer join sys.schemas s on u.default_schema = s.id order by u.name;
-- dependencies
@@ -497,7 +437,7 @@ select 'column used by key', s1.name, t1
select 'column used by index', s1.name, t1.name, c1.name, s2.name, t2.name,
i2.name, dt.dependency_type_name from sys.dependencies d left outer join
sys.dependency_types dt on d.depend_type = dt.dependency_type_id, sys._tables
t1, sys._tables t2, sys.schemas s1, sys.schemas s2, sys._columns c1, sys.idxs
i2 where d.id = c1.id and d.depend_id = i2.id and c1.table_id = t1.id and
t1.schema_id = s1.id and i2.table_id = t2.id and t2.schema_id = s2.id order by
s2.name, t2.name, i2.name, s1.name, t1.name, c1.name;
select 'type used by function', t.systemname, t.sqlname, s.name, f.name,
dt.dependency_type_name from sys.dependencies d left outer join
sys.dependency_types dt on d.depend_type = dt.dependency_type_id, sys.types t,
sys.functions f, sys.schemas s where d.id = t.id and d.depend_id = f.id and
f.schema_id = s.id order by s.name, f.name, t.systemname, t.sqlname;
-- idxs
-select 'sys.idxs', t.name, i.name, it.index_type_name from sys.idxs i left
outer join sys._tables t on t.id = i.table_id left outer join sys.index_types
as it on i.type = it.index_type_id order by t.name, i.name;
+select 'sys.idxs', t.name, i.name, it.index_type_name, c.remark as comment
from sys.idxs i left outer join sys._tables t on t.id = i.table_id left outer
join sys.index_types as it on i.type = it.index_type_id left outer join
sys.comments c on c.id = i.id order by t.name, i.name;
-- keys
select 'sys.keys', t.name, k.name, kt.key_type_name, k2.name, k.action from
sys.keys k left outer join sys.keys k2 on k.rkey = k2.id left outer join
sys._tables t on k.table_id = t.id left outer join sys.key_types kt on k.type =
kt.key_type_id order by t.name, k.name;
-- objects
@@ -512,7 +452,7 @@ select 'grant on column', t.name, c.name
-- functions
select 'grant on function', s.name, f.name, a.name, pc.privilege_code_name,
g.name, p.grantable from sys.functions f left outer join sys.schemas s on
f.schema_id = s.id, sys.privileges p left outer join sys.auths g on p.grantor =
g.id left outer join sys.privilege_codes pc on p.privileges =
pc.privilege_code_id, sys.auths a where f.id = p.obj_id and p.auth_id = a.id
order by s.name, f.name, a.name;
-- sequences
-select 'sys.sequences', s.name, q.name, q.start, q.minvalue, q.maxvalue,
q.increment, q.cacheinc, q.cycle from sys.sequences q left outer join
sys.schemas s on q.schema_id = s.id order by s.name, q.name;
+select 'sys.sequences', s.name, q.name, q.start, q.minvalue, q.maxvalue,
q.increment, q.cacheinc, q.cycle, c.remark as comment from sys.sequences q left
outer join sys.schemas s on q.schema_id = s.id left outer join sys.comments c
on c.id = s.id order by s.name, q.name;
-- statistics (expect empty)
select count(*) from sys.statistics;
-- storagemodelinput (expect empty)
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -1,703 +1,12 @@
-\dn
-\dt
-\dv
-\ds
-\df
-\dSn
-\dSt
-\dSv
-\dSs
-\dSf
-\dn json
-\dn logging
-\dn profiler
-\dn sys
-\dn tmp
-\dn wlc
-\dn wlr
-\dSt sys._columns
-\dSt sys._tables
-\dSt sys.args
-\dSt sys.auths
-\dSt sys.comments
-\dSt sys.db_user_info
-\dSt sys.dependencies
-\dSt sys.dependency_types
-\dSt sys.dump_statements
-\dSt sys.fkey_actions
-\dSt sys.function_languages
-\dSt sys.function_types
-\dSt sys.functions
-\dSt sys.idxs
-\dSt sys.index_types
-\dSt sys.key_types
-\dSt sys.keys
-\dSt sys.keywords
-\dSt sys.netcdf_attrs
-\dSt sys.netcdf_dims
-\dSt sys.netcdf_files
-\dSt sys.netcdf_vardim
-\dSt sys.netcdf_vars
-\dSt sys.objects
-\dSt sys.privilege_codes
-\dSt sys.privileges
-\dSt sys.range_partitions
-\dSt sys.schemas
-\dSt sys.sequences
-\dSt sys.spatial_ref_sys
-\dSt sys.storagemodelinput
-\dSt sys.table_partitions
-\dSt sys.table_types
-\dSt sys.triggers
-\dSt sys.types
-\dSt sys.user_role
-\dSt sys.value_partitions
-\dSt tmp._columns
-\dSt tmp._tables
-\dSt tmp.idxs
-\dSt tmp.keys
-\dSt tmp.objects
-\dSt tmp.triggers
-SYSTEM SCHEMA json
-SYSTEM SCHEMA logging
-SYSTEM SCHEMA profiler
-SYSTEM SCHEMA sys
-SYSTEM SCHEMA tmp
-SYSTEM SCHEMA wlc
-SYSTEM SCHEMA wlr
-SYSTEM TABLE sys._columns
-SYSTEM TABLE sys._tables
-SYSTEM TABLE sys.args
-SYSTEM TABLE sys.auths
-SYSTEM TABLE sys.comments
-SYSTEM TABLE sys.db_user_info
-SYSTEM TABLE sys.dependencies
-SYSTEM TABLE sys.dependency_types
-SYSTEM TABLE sys.dump_statements
-SYSTEM TABLE sys.fkey_actions
-SYSTEM TABLE sys.function_languages
-SYSTEM TABLE sys.function_types
-SYSTEM TABLE sys.functions
-SYSTEM TABLE sys.idxs
-SYSTEM TABLE sys.index_types
-SYSTEM TABLE sys.key_types
-SYSTEM TABLE sys.keys
-SYSTEM TABLE sys.keywords
-SYSTEM TABLE sys.netcdf_attrs
-SYSTEM TABLE sys.netcdf_dims
-SYSTEM TABLE sys.netcdf_files
-SYSTEM TABLE sys.netcdf_vardim
-SYSTEM TABLE sys.netcdf_vars
-SYSTEM TABLE sys.objects
-SYSTEM TABLE sys.privilege_codes
-SYSTEM TABLE sys.privileges
-SYSTEM TABLE sys.range_partitions
-SYSTEM TABLE sys.schemas
-SYSTEM TABLE sys.sequences
-SYSTEM TABLE sys.spatial_ref_sys
-SYSTEM TABLE sys.storagemodelinput
-SYSTEM TABLE sys.table_partitions
-SYSTEM TABLE sys.table_types
-SYSTEM TABLE sys.triggers
-SYSTEM TABLE sys.types
-SYSTEM TABLE sys.user_role
-SYSTEM TABLE sys.value_partitions
-SYSTEM VIEW sys.columns
-SYSTEM VIEW sys.dependencies_vw
-SYSTEM VIEW sys.dependency_args_on_types
-SYSTEM VIEW sys.dependency_columns_on_functions
-SYSTEM VIEW sys.dependency_columns_on_indexes
-SYSTEM VIEW sys.dependency_columns_on_keys
-SYSTEM VIEW sys.dependency_columns_on_procedures
-SYSTEM VIEW sys.dependency_columns_on_triggers
-SYSTEM VIEW sys.dependency_columns_on_types
-SYSTEM VIEW sys.dependency_columns_on_views
-SYSTEM VIEW sys.dependency_functions_on_functions
-SYSTEM VIEW sys.dependency_functions_on_procedures
-SYSTEM VIEW sys.dependency_functions_on_triggers
-SYSTEM VIEW sys.dependency_functions_on_types
-SYSTEM VIEW sys.dependency_functions_on_views
-SYSTEM VIEW sys.dependency_keys_on_foreignkeys
-SYSTEM VIEW sys.dependency_owners_on_schemas
-SYSTEM VIEW sys.dependency_schemas_on_users
-SYSTEM VIEW sys.dependency_tables_on_foreignkeys
-SYSTEM VIEW sys.dependency_tables_on_functions
-SYSTEM VIEW sys.dependency_tables_on_indexes
-SYSTEM VIEW sys.dependency_tables_on_procedures
-SYSTEM VIEW sys.dependency_tables_on_triggers
-SYSTEM VIEW sys.dependency_tables_on_views
-SYSTEM VIEW sys.dependency_views_on_functions
-SYSTEM VIEW sys.dependency_views_on_procedures
-SYSTEM VIEW sys.dependency_views_on_views
-SYSTEM VIEW sys.describe_column_defaults
-SYSTEM VIEW sys.describe_comments
-SYSTEM VIEW sys.describe_constraints
-SYSTEM VIEW sys.describe_foreign_keys
-SYSTEM VIEW sys.describe_functions
-SYSTEM VIEW sys.describe_indices
-SYSTEM VIEW sys.describe_partition_tables
-SYSTEM VIEW sys.describe_privileges
-SYSTEM VIEW sys.describe_sequences
-SYSTEM VIEW sys.describe_tables
-SYSTEM VIEW sys.describe_triggers
-SYSTEM VIEW sys.describe_user_defined_types
-SYSTEM VIEW sys.dump_add_schemas_to_users
-SYSTEM VIEW sys.dump_column_defaults
-SYSTEM VIEW sys.dump_column_grants
-SYSTEM VIEW sys.dump_comments
-SYSTEM VIEW sys.dump_create_roles
-SYSTEM VIEW sys.dump_create_schemas
-SYSTEM VIEW sys.dump_create_users
-SYSTEM VIEW sys.dump_foreign_keys
-SYSTEM VIEW sys.dump_function_grants
-SYSTEM VIEW sys.dump_functions
-SYSTEM VIEW sys.dump_grant_user_privileges
-SYSTEM VIEW sys.dump_indices
-SYSTEM VIEW sys.dump_partition_tables
-SYSTEM VIEW sys.dump_sequences
-SYSTEM VIEW sys.dump_start_sequences
-SYSTEM VIEW sys.dump_table_constraint_type
-SYSTEM VIEW sys.dump_table_grants
-SYSTEM VIEW sys.dump_tables
-SYSTEM VIEW sys.dump_triggers
-SYSTEM VIEW sys.dump_user_defined_types
-SYSTEM VIEW sys.environment
-SYSTEM VIEW sys.fkeys
-SYSTEM VIEW sys.fully_qualified_functions
-SYSTEM VIEW sys.geometry_columns
-SYSTEM VIEW sys.ids
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
