cartodb4/cartodb-postgresql
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into remove_schema_triggers

Browse Source
This commit is contained in:
Alejandro Martínez
2015-12-29 10:41:13 +01:00
parent 2a2a7d534a 2ab059460b
commit 172ca45ea5
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/CDB_QueryTablesTest_expect
+2 -2
View File
@@ -1,4 +1,4 @@
SELECT * FROM geometry_columns|{pg_catalog.pg_attribute,pg_catalog.pg_class,pg_catalog.pg_namespace,pg_catalog.pg_type} SELECT * FROM geometry_columns|{pg_catalog.pg_attribute,pg_catalog.pg_class,pg_catalog.pg_constraint,pg_catalog.pg_namespace,pg_catalog.pg_type}
SELECT a.attname FROM pg_class c JOIN pg_attribute a on (a.attrelid = c.oid)|{pg_catalog.pg_attribute,pg_catalog.pg_class} SELECT a.attname FROM pg_class c JOIN pg_attribute a on (a.attrelid = c.oid)|{pg_catalog.pg_attribute,pg_catalog.pg_class}
CREATE table "my'tab;le" as select 1|{} CREATE table "my'tab;le" as select 1|{}
SELECT a.oid, b.oid FROM pg_class a, pg_class b|{pg_catalog.pg_class} SELECT a.oid, b.oid FROM pg_class a, pg_class b|{pg_catalog.pg_class}
@@ -20,4 +20,4 @@ select * from sc.test|{sc.test}
DROP TABLE DROP TABLE
DROP SCHEMA DROP SCHEMA
SELECT SELECT
* FROM geometry_columns|{pg_catalog.pg_attribute,pg_catalog.pg_class,pg_catalog.pg_namespace,pg_catalog.pg_type} * FROM geometry_columns|{pg_catalog.pg_attribute,pg_catalog.pg_class,pg_catalog.pg_constraint,pg_catalog.pg_namespace,pg_catalog.pg_type}
test/CDB_XYZ_ExtentTest.sql
+1 -1
View File
@@ -4,6 +4,6 @@ range AS ( select z, generate_series(0, pow(2,z)::int-1) as r FROM zoom),
inp AS ( select z0.z, r1.r as x, r2.r as y FROM zoom z0, range r1, range r2 WHERE z0.z = r1.z and r1.z = r2.z ), inp AS ( select z0.z, r1.r as x, r2.r as y FROM zoom z0, range r1, range r2 WHERE z0.z = r1.z and r1.z = r2.z ),
ext AS ( select x,y,z,CDB_XYZ_Extent(x,y,z) as g from inp ) ext AS ( select x,y,z,CDB_XYZ_Extent(x,y,z) as g from inp )
select X::text || ',' || Y::text || ',' || Z::text as xyz, select X::text || ',' || Y::text || ',' || Z::text as xyz,
st_xmin(g), st_xmax(g), st_ymin(g), st_ymax(g) round(st_xmin(g)), round(st_xmax(g)), round(st_ymin(g)), round(st_ymax(g))
from ext order by xyz; from ext order by xyz;
test/CDB_XYZ_ExtentTest_expect
+21 -21
View File
@@ -1,21 +1,21 @@
0,0,0|-20037508.5|20037508.5|-20037508.5|20037508.5 0,0,0|-20037508|20037508|-20037508|20037508
0,0,1|-20037508.5|0|0|20037508.5 0,0,1|-20037508|0|0|20037508
0,0,2|-20037508.5|-10018754.25|10018754.25|20037508.5 0,0,2|-20037508|-10018754|10018754|20037508
0,1,1|-20037508.5|0|-20037508.5|0 0,1,1|-20037508|0|-20037508|0
0,1,2|-20037508.5|-10018754.25|0|10018754.25 0,1,2|-20037508|-10018754|0|10018754
0,2,2|-20037508.5|-10018754.25|-10018754.25|0 0,2,2|-20037508|-10018754|-10018754|0
0,3,2|-20037508.5|-10018754.25|-20037508.5|-10018754.25 0,3,2|-20037508|-10018754|-20037508|-10018754
1,0,1|0|20037508.5|0|20037508.5 1,0,1|0|20037508|0|20037508
1,0,2|-10018754.25|0|10018754.25|20037508.5 1,0,2|-10018754|0|10018754|20037508
1,1,1|0|20037508.5|-20037508.5|0 1,1,1|0|20037508|-20037508|0
1,1,2|-10018754.25|0|0|10018754.25 1,1,2|-10018754|0|0|10018754
1,2,2|-10018754.25|0|-10018754.25|0 1,2,2|-10018754|0|-10018754|0
1,3,2|-10018754.25|0|-20037508.5|-10018754.25 1,3,2|-10018754|0|-20037508|-10018754
2,0,2|0|10018754.25|10018754.25|20037508.5 2,0,2|0|10018754|10018754|20037508
2,1,2|0|10018754.25|0|10018754.25 2,1,2|0|10018754|0|10018754
2,2,2|0|10018754.25|-10018754.25|0 2,2,2|0|10018754|-10018754|0
2,3,2|0|10018754.25|-20037508.5|-10018754.25 2,3,2|0|10018754|-20037508|-10018754
3,0,2|10018754.25|20037508.5|10018754.25|20037508.5 3,0,2|10018754|20037508|10018754|20037508
3,1,2|10018754.25|20037508.5|0|10018754.25 3,1,2|10018754|20037508|0|10018754
3,2,2|10018754.25|20037508.5|-10018754.25|0 3,2,2|10018754|20037508|-10018754|0
3,3,2|10018754.25|20037508.5|-20037508.5|-10018754.25 3,3,2|10018754|20037508|-20037508|-10018754