Changeset: 798d68a0d298 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=798d68a0d298
Modified Files:
sql/test/mapi/Tests/php_monetdb.stable.out
Branch: sciql
Log Message:
approved expected stable.out
diffs (123 lines):
diff --git a/sql/test/mapi/Tests/php_monetdb.stable.out
b/sql/test/mapi/Tests/php_monetdb.stable.out
--- a/sql/test/mapi/Tests/php_monetdb.stable.out
+++ b/sql/test/mapi/Tests/php_monetdb.stable.out
@@ -38,6 +38,7 @@ dependencies
connections
_tables
_columns
+_arrays
_dimensions
keys
idxs
@@ -45,14 +46,15 @@ triggers
objects
_tables
_columns
+_arrays
_dimensions
keys
idxs
triggers
objects
tables
+arrays
columns
-arrays
dimensions
db_user_info
users
@@ -62,48 +64,54 @@ privileges
queryhistory
callhistory
querylog
+files
+catalog
storagemodelinput
tablestoragemodel
systemfunctions
-id name schema_id query type system commit_action
readonly fixed_array nr_dimensions temporary
-2001 schemas 2000 0 true 0 false false 0
0
-2006 types 2000 0 true 0 false false 0
0
-2015 functions 2000 0 true 0 false false
0 0
-2024 args 2000 0 true 0 false false 0
0
-2032 sequences 2000 0 true 0 false false
0 0
-2042 dependencies 2000 0 true 0 false false
0 0
-2046 connections 2000 0 true 0 false false
0 0
-2055 _tables 2000 0 true 0 false false 0
0
-2066 _columns 2000 0 true 0 false false
0 0
-2077 _dimensions 2000 0 true 0 false false
0 0
-2082 keys 2000 0 true 0 false false 0
0
-2089 idxs 2000 0 true 0 false false 0
0
-2094 triggers 2000 0 true 0 false false
0 0
-2105 objects 2000 0 true 0 false false 0
0
-2110 _tables 2109 0 true 2 false false 0
0
-2121 _columns 2109 0 true 2 false false
0 0
-2132 _dimensions 2109 0 true 2 false false
0 0
-2137 keys 2109 0 true 2 false false 0
0
-2144 idxs 2109 0 true 2 false false 0
0
-2149 triggers 2109 0 true 2 false false
0 0
-2160 objects 2109 0 true 2 false false 0
0
-5007 tables 2000 SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM
"sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM
"tmp"."_tables" AS t) AS tables where tables.type < 2; 1 true 0
false false 0 0
-5019 columns 2000 SELECT * FROM (SELECT p.* FROM "sys"."_columns" AS p
UNION ALL SELECT t.* FROM "tmp"."_columns" AS t) AS columns; 1 true
0 false false 0 0
-5030 arrays 2000 SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM
"sys"."_tables" AS p WHERE nr_dimensions > 0 UNION ALL SELECT t.*, 1 AS
"temporary" FROM "tmp"."_tables" AS t WHERE nr_dimensions > 0) AS arrays;
1 true 0 false false 0 0
-5042 dimensions 2000 SELECT * FROM (SELECT pc.*, "pd"."start",
pd.step, pd.stop FROM "sys"."_columns" AS pc, "sys"."_dimensions" AS pd WHERE
pc.id = pd.column_id UNION ALL SELECT tc.*, "td"."start", td.step, td.stop FROM
"tmp"."_columns" AS tc, "tmp"."_dimensions" AS td WHERE tc.id = td.column_id)
AS dimensions; 1 true 0 false false 0 0
-5065 db_user_info 2000 0 true 0 false false
0 0
-5073 users 2000 SELECT u."name" AS "name", ui."fullname",
ui."default_schema" FROM db_users() AS u LEFT JOIN "sys"."db_user_info" AS ui
ON u."name" = ui."name" ; 1 true 0 false false 0
0
-5077 user_role 2000 0 true 0 false false
0 0
-5080 auths 2000 0 true 0 false false 0
0
-5084 privileges 2000 0 true 0 false false
0 0
-5237 queryhistory 2000 0 true 0 false false
0 0
-5251 callhistory 2000 0 true 0 false false
0 0
-5268 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
true 0 false false 0 0
-6034 storagemodelinput 2000 0 true 0 false
false 0 0
-6075 tablestoragemodel 2000 -- A summary of the table storage
requirement is is available as a table view.n-- The auxillary column denotes
the maximum space if all non-sorted columnsn-- would be augmented with a hash
(rare situation)ncreate view tablestoragemodelnas select
"schema","table",max(count) as "count",ntsum(columnsize) as
columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case
when sorted = false then 8 * count else 0 end) as auxillarynfrom storagemodel()
group by "schema","table"; 1 true 0 false false 0
0
-7024 systemfunctions 2000 0 true 0 false false
0 0
+id name schema_id query type system commit_action
readonly temporary
+2001 schemas 2000 0 true 0 false 0
+2006 types 2000 0 true 0 false 0
+2015 functions 2000 0 true 0 false 0
+2024 args 2000 0 true 0 false 0
+2032 sequences 2000 0 true 0 false 0
+2042 dependencies 2000 0 true 0 false 0
+2046 connections 2000 0 true 0 false 0
+2055 _tables 2000 0 true 0 false 0
+2064 _columns 2000 0 true 0 false 0
+2075 _arrays 2000 0 true 0 false 0
+2080 _dimensions 2000 0 true 0 false 0
+2086 keys 2000 0 true 0 false 0
+2093 idxs 2000 0 true 0 false 0
+2098 triggers 2000 0 true 0 false 0
+2109 objects 2000 0 true 0 false 0
+2114 _tables 2113 0 true 2 false 0
+2123 _columns 2113 0 true 2 false 0
+2134 _arrays 2113 0 true 2 false 0
+2139 _dimensions 2113 0 true 2 false 0
+2145 keys 2113 0 true 2 false 0
+2152 idxs 2113 0 true 2 false 0
+2157 triggers 2113 0 true 2 false 0
+2168 objects 2113 0 true 2 false 0
+5082 tables 2000 SELECT * FROM (SELECT p.*, 0 AS "temporary" FROM
"sys"."_tables" AS p UNION ALL SELECT t.*, 1 AS "temporary" FROM
"tmp"."_tables" AS t) AS tables where tables.type < 2; 1 true 0
false 0
+5092 arrays 2000 SELECT * FROM (SELECT pt.*, 0 AS "temporary",
pa.valence, pa.fixed, pa.materialised FROM "sys"."_tables" AS pt,
"sys"."_arrays" AS pa WHERE pt.id = pa.table_id UNION ALL SELECT tt.*, 1 AS
"temporary", ta.valence, ta.fixed, ta.materialised FROM "tmp"."_tables" AS tt,
"tmp"."_arrays" AS ta WHERE tt.id = ta.table_id) AS arrays; 1 true 0
false 0
+5105 columns 2000 SELECT * FROM (SELECT p.* FROM "sys"."_columns" AS p
UNION ALL SELECT t.* FROM "tmp"."_columns" AS t) AS columns; 1 true
0 false 0
+5116 dimensions 2000 SELECT * FROM (SELECT pc.*, "pd"."start",
pd.step, pd.stop, pd.storage_order FROM "sys"."_columns" AS pc,
"sys"."_dimensions" AS pd WHERE pc.id = pd.column_id UNION ALL SELECT tc.*,
"td"."start", td.step, td.stop, td.storage_order FROM "tmp"."_columns" AS tc,
"tmp"."_dimensions" AS td WHERE tc.id = td.column_id) AS dimensions; 1
true 0 false 0
+5137 db_user_info 2000 0 true 0 false 0
+5145 users 2000 SELECT u."name" AS "name", ui."fullname",
ui."default_schema" FROM db_users() AS u LEFT JOIN "sys"."db_user_info" AS ui
ON u."name" = ui."name" ; 1 true 0 false 0
+5149 user_role 2000 0 true 0 false 0
+5152 auths 2000 0 true 0 false 0
+5156 privileges 2000 0 true 0 false 0
+5309 queryhistory 2000 0 true 0 false 0
+5323 callhistory 2000 0 true 0 false 0
+5340 querylog 2000 create view querylog asnselect qd.*, ql.ctime,
ql.arguments, ql.exec, ql.result, ql.foot, ql.memory, ql.tuples, ql.inblock,
ql.oublock from queryhistory qd, callhistory qlnwhere qd.id = ql.id; 1
true 0 false 0
+6781 files 6775 0 false 0 false 0
+6788 catalog 6775 0 false 0 false 0
+7231 storagemodelinput 2000 0 true 0 false
0
+7272 tablestoragemodel 2000 -- A summary of the table storage
requirement is is available as a table view.n-- The auxillary column denotes
the maximum space if all non-sorted columnsn-- would be augmented with a hash
(rare situation)ncreate view tablestoragemodelnas select
"schema","table",max(count) as "count",ntsum(columnsize) as
columnsize,ntsum(heapsize) as heapsize,ntsum(indices) as indices,ntsum(case
when sorted = false then 8 * count else 0 end) as auxillarynfrom storagemodel()
group by "schema","table"; 1 true 0 false 0
+7294 systemfunctions 2000 0 true 0 false 0
-# 12:11:54 >
-# 12:11:54 > "Done."
-# 12:11:54 >
+# 19:13:28 >
+# 19:13:28 > "Done."
+# 19:13:28 >
_______________________________________________
checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
