eliminate quotes in IDs

2016-05-03 14:10:47 -04:00
parent 502ffca6ec
commit 7f2d675602
16 changed files with 3412 additions and 3412 deletions
@@ -8,7 +8,7 @@
 SELECT
  cdb_observatory._OBS_GeomTable(
    ST_SetSRID(ST_Point(-74.0059, 40.7128), 4326),
-    '"us.census.tiger".census_tract'
+    'us.census.tiger.census_tract'
  );

 -- get null for unknown geometry_id
@@ -16,14 +16,14 @@ SELECT
 SELECT
  cdb_observatory._OBS_GeomTable(
    ST_SetSRID(ST_Point(-74.0059, 40.7128), 4326),
-    '"us.census.tiger".nonexistant_id' -- not in catalog
+    'us.census.tiger.nonexistant_id' -- not in catalog
  );

 -- future test: give back nulls when geometry doesn't intersect
 -- SELECT
 --   cdb_observatory._OBS_GeomTable(
 --     ST_SetSRID(ST_Point(0,0)), -- should give back null since it's in the ocean?
--     '"us.census.tiger".census_tract'
+--     'us.census.tiger.census_tract'
 --   );

 -- OBS_GetColumnData
@@ -35,8 +35,8 @@ SELECT
 WITH result as (
 SELECT
  array_agg(a) expected from cdb_observatory._OBS_GetColumnData(
-    '"us.census.tiger".census_tract',
-    Array['"us.census.tiger".census_tract_geoid', '"us.census.acs".B01001001'],
+    'us.census.tiger.census_tract',
+    Array['us.census.tiger.census_tract_geoid', 'us.census.acs.B01001001'],
    '2009 - 2013') a
 )
 select (expected)[1]::text  = '{"colname":"geoid","tablename":"obs_d34555209878e8c4b37cf0b2b3d072ff129ec470","aggregate":null,"name":"US Census Tract Geoids","type":"Text","description":""}' as test_get_obs_column_with_geoid_and_census_1,
@@ -48,15 +48,15 @@ from result;
 WITH result as (
 SELECT
  array_agg(a) expected from cdb_observatory._OBS_GetColumnData(
-    '"us.census.tiger".census_tract',
-    Array['"us.census.tiger".baloney'],
+    'us.census.tiger.census_tract',
+    Array['us.census.tiger.baloney'],
    '2009 - 2013') a
 )
 select expected is null as OBS_GetColumnData_missing_measure
 from result;

 -- OBS_LookupCensusHuman
-- should give back: {"\"us.census.acs\".B19083001"}
+-- should give back: {"us.census.acs.B19083001"}
 SELECT
  cdb_observatory._OBS_LookupCensusHuman(
    Array['gini_index']
@@ -83,9 +83,9 @@ SELECT

 SELECT cdb_observatory._OBS_GetRelatedColumn(
    Array[
-    '"es.ine".pop_0_4',
-     '"us.census.acs".B01001001',
-    '"us.census.acs".B01001002'
+     'es.ine.pop_0_4',
+     'us.census.acs.B01001001',
+     'us.census.acs.B01001002'
    ],
     'denominator'
 );
@@ -57,9 +57,9 @@ WITH result as (
  SELECT _OBS_Get::text as expected FROM
  cdb_observatory._OBS_Get(
    cdb_observatory._TestPoint(),
-    Array['"us.census.acs".B19083001']::text[],
+    Array['us.census.acs.B19083001']::text[],
    '2009 - 2013',
-    '"us.census.tiger".block_group'
+    'us.census.tiger.block_group'
  )
 ) select expected = '{"value":0.3494,"name":"Gini Index","tablename":"obs_3e7cc9cfd403b912c57b42d5f9195af9ce2f3cdb","aggregate":"","type":"Numeric","description":""}'
  as OBS_Get_gini_index_at_test_point
@@ -70,9 +70,9 @@ WITH result as (
  SELECT count(_OBS_Get) as expected FROM
  cdb_observatory._OBS_Get(
    ST_SetSRID(ST_Point(0, 0), 4326),
-    Array['"us.census.acs".B19083001']::text[],
+    Array['us.census.acs.B19083001']::text[],
    '2009 - 2013',
-    '"us.census.tiger".block_group'
+    'us.census.tiger.block_group'
  )
 ) select expected = 0 as OBS_Get_gini_index_at_null_island
  from result;
@@ -123,21 +123,21 @@ SELECT

 SELECT cdb_observatory.OBS_GetSegmentSnapshot(
    cdb_observatory._TestPoint(),
-    '"us.census.tiger".census_tract'
-)::text = '{"segment_name":"SS_segment_10_clusters","\"us.census.acs\".B01001001_quantile":"0.234783783783784","\"us.census.acs\".B01001002_quantile":"0.422405405405405","\"us.census.acs\".B01001026_quantile":"0.0987567567567568","\"us.census.acs\".B01002001_quantile":"0.0715","\"us.census.acs\".B03002003_quantile":"0.295310810810811","\"us.census.acs\".B03002004_quantile":"0.407189189189189","\"us.census.acs\".B03002006_quantile":"0.625608108108108","\"us.census.acs\".B03002012_quantile":"0.795202702702703","\"us.census.acs\".B05001006_quantile":"0.703797297297297","\"us.census.acs\".B08006001_quantile":"0.59227027027027","\"us.census.acs\".B08006002_quantile":"0.0180540540540541","\"us.census.acs\".B08006008_quantile":"0.993756756756757","\"us.census.acs\".B08006009_quantile":"0.728162162162162","\"us.census.acs\".B08006011_quantile":"0.995972972972973","\"us.census.acs\".B08006015_quantile":"0.929135135135135","\"us.census.acs\".B08006017_quantile":"0.625432432432432","\"us.census.acs\".B09001001_quantile":"0.0386081081081081","\"us.census.acs\".B11001001_quantile":"0.157121621621622","\"us.census.acs\".B14001001_quantile":"0.241878378378378","\"us.census.acs\".B14001002_quantile":"0.173783783783784","\"us.census.acs\".B14001005_quantile":"0.0380675675675676","\"us.census.acs\".B14001006_quantile":"0.0308108108108108","\"us.census.acs\".B14001007_quantile":"0.0486216216216216","\"us.census.acs\".B14001008_quantile":"0.479743243243243","\"us.census.acs\".B15003001_quantile":"0.297675675675676","\"us.census.acs\".B15003017_quantile":"0.190351351351351","\"us.census.acs\".B15003022_quantile":"0.802513513513514","\"us.census.acs\".B15003023_quantile":"0.757148648648649","\"us.census.acs\".B16001001_quantile":"0.255405405405405","\"us.census.acs\".B16001002_quantile":"0.196094594594595","\"us.census.acs\".B16001003_quantile":"0.816851351351351","\"us.census.acs\".B17001001_quantile":"0.252513513513514","\"us.census.acs\".B17001002_quantile":"0.560054054054054","\"us.census.acs\".B19013001_quantile":"0.777472972972973","\"us.census.acs\".B19083001_quantile":"0.336932432432432","\"us.census.acs\".B19301001_quantile":"0.655378378378378","\"us.census.acs\".B25001001_quantile":"0.141810810810811","\"us.census.acs\".B25002003_quantile":"0.362824324324324","\"us.census.acs\".B25004002_quantile":"0.463837837837838","\"us.census.acs\".B25004004_quantile":"0","\"us.census.acs\".B25058001_quantile":"0.939040540540541","\"us.census.acs\".B25071001_quantile":"0.419445945945946","\"us.census.acs\".B25075001_quantile":"0.0387972972972973","\"us.census.acs\".B25075025_quantile":"0"}' as test_point_segmentation;
+    'us.census.tiger.census_tract'
+)::text = '{"segment_name":"SS_segment_10_clusters","us.census.acs.B01001001_quantile":"0.234783783783784","us.census.acs.B01001002_quantile":"0.422405405405405","us.census.acs.B01001026_quantile":"0.0987567567567568","us.census.acs.B01002001_quantile":"0.0715","us.census.acs.B03002003_quantile":"0.295310810810811","us.census.acs.B03002004_quantile":"0.407189189189189","us.census.acs.B03002006_quantile":"0.625608108108108","us.census.acs.B03002012_quantile":"0.795202702702703","us.census.acs.B05001006_quantile":"0.703797297297297","us.census.acs.B08006001_quantile":"0.59227027027027","us.census.acs.B08006002_quantile":"0.0180540540540541","us.census.acs.B08006008_quantile":"0.993756756756757","us.census.acs.B08006009_quantile":"0.728162162162162","us.census.acs.B08006011_quantile":"0.995972972972973","us.census.acs.B08006015_quantile":"0.929135135135135","us.census.acs.B08006017_quantile":"0.625432432432432","us.census.acs.B09001001_quantile":"0.0386081081081081","us.census.acs.B11001001_quantile":"0.157121621621622","us.census.acs.B14001001_quantile":"0.241878378378378","us.census.acs.B14001002_quantile":"0.173783783783784","us.census.acs.B14001005_quantile":"0.0380675675675676","us.census.acs.B14001006_quantile":"0.0308108108108108","us.census.acs.B14001007_quantile":"0.0486216216216216","us.census.acs.B14001008_quantile":"0.479743243243243","us.census.acs.B15003001_quantile":"0.297675675675676","us.census.acs.B15003017_quantile":"0.190351351351351","us.census.acs.B15003022_quantile":"0.802513513513514","us.census.acs.B15003023_quantile":"0.757148648648649","us.census.acs.B16001001_quantile":"0.255405405405405","us.census.acs.B16001002_quantile":"0.196094594594595","us.census.acs.B16001003_quantile":"0.816851351351351","us.census.acs.B17001001_quantile":"0.252513513513514","us.census.acs.B17001002_quantile":"0.560054054054054","us.census.acs.B19013001_quantile":"0.777472972972973","us.census.acs.B19083001_quantile":"0.336932432432432","us.census.acs.B19301001_quantile":"0.655378378378378","us.census.acs.B25001001_quantile":"0.141810810810811","us.census.acs.B25002003_quantile":"0.362824324324324","us.census.acs.B25004002_quantile":"0.463837837837838","us.census.acs.B25004004_quantile":"0","us.census.acs.B25058001_quantile":"0.939040540540541","us.census.acs.B25071001_quantile":"0.419445945945946","us.census.acs.B25075001_quantile":"0.0387972972972973","us.census.acs.B25075025_quantile":"0"}' as test_point_segmentation;

 -- segmentation around null island
 SELECT cdb_observatory.OBS_GetSegmentSnapshot(
    ST_SetSRID(ST_Point(0, 0), 4326),
-    '"us.census.tiger".census_tract'
-)::text = '{"segment_name":null,"\"us.census.acs\".B01001001_quantile":null,"\"us.census.acs\".B01001002_quantile":null,"\"us.census.acs\".B01001026_quantile":null,"\"us.census.acs\".B01002001_quantile":null,"\"us.census.acs\".B03002003_quantile":null,"\"us.census.acs\".B03002004_quantile":null,"\"us.census.acs\".B03002006_quantile":null,"\"us.census.acs\".B03002012_quantile":null,"\"us.census.acs\".B05001006_quantile":null,"\"us.census.acs\".B08006001_quantile":null,"\"us.census.acs\".B08006002_quantile":null,"\"us.census.acs\".B08006008_quantile":null,"\"us.census.acs\".B08006009_quantile":null,"\"us.census.acs\".B08006011_quantile":null,"\"us.census.acs\".B08006015_quantile":null,"\"us.census.acs\".B08006017_quantile":null,"\"us.census.acs\".B09001001_quantile":null,"\"us.census.acs\".B11001001_quantile":null,"\"us.census.acs\".B14001001_quantile":null,"\"us.census.acs\".B14001002_quantile":null,"\"us.census.acs\".B14001005_quantile":null,"\"us.census.acs\".B14001006_quantile":null,"\"us.census.acs\".B14001007_quantile":null,"\"us.census.acs\".B14001008_quantile":null,"\"us.census.acs\".B15003001_quantile":null,"\"us.census.acs\".B15003017_quantile":null,"\"us.census.acs\".B15003022_quantile":null,"\"us.census.acs\".B15003023_quantile":null,"\"us.census.acs\".B16001001_quantile":null,"\"us.census.acs\".B16001002_quantile":null,"\"us.census.acs\".B16001003_quantile":null,"\"us.census.acs\".B17001001_quantile":null,"\"us.census.acs\".B17001002_quantile":null,"\"us.census.acs\".B19013001_quantile":null,"\"us.census.acs\".B19083001_quantile":null,"\"us.census.acs\".B19301001_quantile":null,"\"us.census.acs\".B25001001_quantile":null,"\"us.census.acs\".B25002003_quantile":null,"\"us.census.acs\".B25004002_quantile":null,"\"us.census.acs\".B25004004_quantile":null,"\"us.census.acs\".B25058001_quantile":null,"\"us.census.acs\".B25071001_quantile":null,"\"us.census.acs\".B25075001_quantile":null,"\"us.census.acs\".B25075025_quantile":null}' as null_island_segmentation;
+    'us.census.tiger.census_tract'
+)::text = '{"segment_name":null,"us.census.acs.B01001001_quantile":null,"us.census.acs.B01001002_quantile":null,"us.census.acs.B01001026_quantile":null,"us.census.acs.B01002001_quantile":null,"us.census.acs.B03002003_quantile":null,"us.census.acs.B03002004_quantile":null,"us.census.acs.B03002006_quantile":null,"us.census.acs.B03002012_quantile":null,"us.census.acs.B05001006_quantile":null,"us.census.acs.B08006001_quantile":null,"us.census.acs.B08006002_quantile":null,"us.census.acs.B08006008_quantile":null,"us.census.acs.B08006009_quantile":null,"us.census.acs.B08006011_quantile":null,"us.census.acs.B08006015_quantile":null,"us.census.acs.B08006017_quantile":null,"us.census.acs.B09001001_quantile":null,"us.census.acs.B11001001_quantile":null,"us.census.acs.B14001001_quantile":null,"us.census.acs.B14001002_quantile":null,"us.census.acs.B14001005_quantile":null,"us.census.acs.B14001006_quantile":null,"us.census.acs.B14001007_quantile":null,"us.census.acs.B14001008_quantile":null,"us.census.acs.B15003001_quantile":null,"us.census.acs.B15003017_quantile":null,"us.census.acs.B15003022_quantile":null,"us.census.acs.B15003023_quantile":null,"us.census.acs.B16001001_quantile":null,"us.census.acs.B16001002_quantile":null,"us.census.acs.B16001003_quantile":null,"us.census.acs.B17001001_quantile":null,"us.census.acs.B17001002_quantile":null,"us.census.acs.B19013001_quantile":null,"us.census.acs.B19083001_quantile":null,"us.census.acs.B19301001_quantile":null,"us.census.acs.B25001001_quantile":null,"us.census.acs.B25002003_quantile":null,"us.census.acs.B25004002_quantile":null,"us.census.acs.B25004004_quantile":null,"us.census.acs.B25058001_quantile":null,"us.census.acs.B25071001_quantile":null,"us.census.acs.B25075001_quantile":null,"us.census.acs.B25075025_quantile":null}' as null_island_segmentation;

 WITH result as (
  SELECT array_agg(_OBS_GetCategories) as expected FROM
    cdb_observatory._OBS_GetCategories(
      cdb_observatory._TestPoint(),
-      Array['"us.census.spielman_singleton_segments".X10'],
-      '"us.census.tiger".census_tract'
+      Array['us.census.spielman_singleton_segments.X10'],
+      'us.census.tiger.census_tract'
  )
 )
  select (expected)[1]::text = '{"category":"Wealthy, urban without Kids","name":"SS_segment_10_clusters","tablename":"obs_65f29658e096ca1485bf683f65fdbc9f05ec3c5d","aggregate":null,"type":"Text","description":"Sociodemographic classes from Spielman and Singleton 2015, 10 clusters"}' as GetCategories_at_test_point_1,
@@ -148,8 +148,8 @@ WITH result as (
  SELECT array_agg(_OBS_GetCategories) as expected FROM
    cdb_observatory._OBS_GetCategories(
      ST_SetSRID(ST_Point(0,0), 4326),
-      Array['"us.census.spielman_singleton_segments".X10'],
-      '"us.census.tiger".census_tract'
+      Array['us.census.spielman_singleton_segments.X10'],
+      'us.census.tiger.census_tract'
  )
 )
  select expected is null as GetCategories_at_null_island
@@ -159,33 +159,33 @@ WITH result as (
 SELECT * FROM
  cdb_observatory.OBS_GetMeasure(
    cdb_observatory._TestPoint(),
-    '"us.census.acs".B01001001'
+    'us.census.acs.B01001001'
 );

 -- Poly-based OBS_GetMeasure, default normalization (none)
 SELECT * FROM
  cdb_observatory.OBS_GetMeasure(
    cdb_observatory._TestArea(),
-    '"us.census.acs".B01001001'
+    'us.census.acs.B01001001'
 );

 -- Point-based OBS_GetMeasure with denominator normalization
 SELECT cdb_observatory.OBS_GetMeasure(
  cdb_observatory._TestPoint(),
-  '"us.census.acs".B01001002', 'denominator');
+  'us.census.acs.B01001002', 'denominator');

 -- Poly-based OBS_GetMeasure with denominator normalization
 SELECT cdb_observatory.OBS_GetMeasure(
  cdb_observatory._TestArea(),
-  '"us.census.acs".B01001002', 'denominator');
+  'us.census.acs.B01001002', 'denominator');

 -- Point-based OBS_GetCategory
 SELECT cdb_observatory.OBS_GetCategory(
-  cdb_observatory._TestPoint(), '"us.census.spielman_singleton_segments".X10');
+  cdb_observatory._TestPoint(), 'us.census.spielman_singleton_segments.X10');

 -- Poly-based OBS_GetCategory
 SELECT cdb_observatory.OBS_GetCategory(
-  cdb_observatory._TestArea(), '"us.census.spielman_singleton_segments".X10');
+  cdb_observatory._TestArea(), 'us.census.spielman_singleton_segments.X10');

 -- Point-based OBS_GetPopulation, default normalization (area)
 SELECT * FROM
@@ -13,7 +13,7 @@ SELECT
                   'obs_23da37d4e66e9de2f525572967f8618bde99a8c0') As _OBS_SearchTables_tables_match,
  t.timespan = '2013' As _OBS_SearchTables_timespan_matches
 FROM cdb_observatory._OBS_SearchTables(
-  '"us.census.tiger".county',
+  'us.census.tiger.county',
  '2013'
 ) As t(table_name, timespan);

@@ -21,7 +21,7 @@ FROM cdb_observatory._OBS_SearchTables(
 -- should not return tables for year that does not match
 SELECT count(*) = 0 As _OBS_SearchTables_timespan_does_not_match
 FROM cdb_observatory._OBS_SearchTables(
-  '"us.census.tiger".county',
+  'us.census.tiger.county',
  '1988' -- year before first tiger data was collected
 ) As t(table_name, timespan);

@@ -13,34 +13,34 @@
 -- timespan implictly null
 SELECT cdb_observatory.OBS_GetBoundary(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".census_tract'
+  'us.census.tiger.census_tract'
 ) = :'cartodb_census_tract_geometry' As OBS_GetBoundary_cartodb_census_tract;

 -- expect most recent census county boundary (brooklyn) at cartodb nyc
 -- timespan implictly null
 SELECT cdb_observatory.OBS_GetBoundary(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".county'
+  'us.census.tiger.county'
 ) = :'cartodb_county_geometry' As OBS_GetBoundary_cartodb_county;

 -- expect null geometry since boundary_id is null
 -- timespan implictly null
 SELECT cdb_observatory.OBS_GetBoundary(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".non_existent'
+  'us.census.tiger.non_existent'
 ) IS NULL As OBS_GetBoundary_non_existent_boundary_id;

 -- expect null geometry since there are no census tracts at null island
 -- timespan implictly null
 SELECT cdb_observatory.OBS_GetBoundary(
  CDB_LatLng(0, 0),
-  '"us.census.tiger".census_tract'
+  'us.census.tiger.census_tract'
 ) IS NULL As OBS_GetBoundary_null_island_census_tract;

 -- expect census tract boundary at cartodb nyc from 2013
 SELECT cdb_observatory.OBS_GetBoundary(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".census_tract',
+  'us.census.tiger.census_tract',
  '2013'
 ) = :'cartodb_census_tract_geometry' As OBS_GetBoundary_year_census_tract;

@@ -48,7 +48,7 @@ SELECT cdb_observatory.OBS_GetBoundary(
 -- look for census tracts a year before census released them
 SELECT cdb_observatory.OBS_GetBoundary(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".census_tract',
+  'us.census.tiger.census_tract',
  '1988'
 ) IS NULL As OBS_GetBoundary_unlisted_year;

@@ -57,13 +57,13 @@ SELECT cdb_observatory.OBS_GetBoundary(
 -- should give back '36047048500', the geoid of cartodb's census tract
 SELECT cdb_observatory.OBS_GetBoundaryId(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".census_tract'
+  'us.census.tiger.census_tract'
 ) = '36047048500'::text As OBS_GetBoundaryId_cartodb_census_tract;

 -- should give back '36047048500', the geoid of cartodb's census tract
 SELECT cdb_observatory.OBS_GetBoundaryId(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".census_tract',
+  'us.census.tiger.census_tract',
  '2013'
 ) = '36047048500'::text As OBS_GetBoundaryId_cartodb_census_tract_with_year;

@@ -71,14 +71,14 @@ SELECT cdb_observatory.OBS_GetBoundaryId(
 --  Brooklyn, NY)
 SELECT cdb_observatory.OBS_GetBoundaryId(
  cdb_observatory._TestPoint(),
-  '"us.census.tiger".county',
+  'us.census.tiger.county',
  '2013'
 ) = '36047'::text As OBS_GetBoundaryId_cartodb_county_with_year;

 -- should give back null since there is not a census tract at null island
 SELECT cdb_observatory.OBS_GetBoundaryId(
  CDB_LatLng(0, 0),
-  '"us.census.tiger".census_tract'
+  'us.census.tiger.census_tract'
 ) IS NULL As OBS_GetBoundaryId_null_island;

 -- OBS_GetBoundaryById
@@ -87,29 +87,29 @@ SELECT cdb_observatory.OBS_GetBoundaryId(

 SELECT cdb_observatory.OBS_GetBoundaryById(
  '36047',
-  '"us.census.tiger".county'
+  'us.census.tiger.county'
 ) = :'cartodb_county_geometry' As OBS_GetBoundaryById_cartodb_county;

 -- Should match output of GetBoundary on similar inputs
 SELECT cdb_observatory.OBS_GetBoundaryById(
  '36047', -- cartodb's county
-  '"us.census.tiger".county'
+  'us.census.tiger.county'
 ) = cdb_observatory.OBS_GetBoundary(
  cdb_observatory._TestPoint(), -- CartoDB's office
-  '"us.census.tiger".county'
+  'us.census.tiger.county'
 ) As OBS_GetBoundaryById_compared_with_obs_GetBoundary;

 -- should give null since boundary_id does not match geometry reference id
 SELECT cdb_observatory.OBS_GetBoundaryById(
  '36047',
-  '"us.census.tiger".county',
+  'us.census.tiger.county',
  '2013'
 ) = :'cartodb_county_geometry' OBS_GetBoundaryById_boundary_id_mismatch_geom_id;

 -- should give null since boundary_id does not match geometry reference id
 SELECT cdb_observatory.OBS_GetBoundaryById(
  '36047',
-  '"us.census.tiger".census_tract'
+  'us.census.tiger.census_tract'
 ) IS NULL As OBS_GetBoundaryById_boundary_id_mismatch_geom_id;

 \i test/sql/drop_fixtures.sql