Merge pull request #27 from davehowell/fix/qualify-base-model-schemas

Claire Carroll · web-flow · commit 93eb90097f4e · 2020-07-31T09:45:40.000-04:00
Fix/qualify base model schemas
diff --git a/models/base/pg_attribute.sql b/models/base/pg_attribute.sql
@@ -27,4 +27,4 @@ select
 , (case attsortkeyord
         when 1 then attname
         else null end) as sort_key
-from pg_attribute
+from pg_catalog.pg_attribute
diff --git a/models/base/pg_class.sql b/models/base/pg_class.sql
@@ -30,4 +30,4 @@ select
 , relhasrules
 , relhassubclass
 , relacl
-from pg_class
+from pg_catalog.pg_class
diff --git a/models/base/pg_depend.sql b/models/base/pg_depend.sql
@@ -6,4 +6,4 @@ select
 , refobjid
 , refobjsubid
 , deptype
-from pg_depend
+from pg_catalog.pg_depend
diff --git a/models/base/pg_namespace.sql b/models/base/pg_namespace.sql
@@ -3,4 +3,4 @@ select
 , nspname
 , nspowner
 , nspacl
-from pg_namespace
+from pg_catalog.pg_namespace
diff --git a/models/base/pg_tables.sql b/models/base/pg_tables.sql
@@ -6,4 +6,4 @@ select
 , hasindexes as has_indexes
 , hasrules as has_rules
 , hastriggers as has_triggers
-from pg_tables
+from pg_catalog.pg_tables
diff --git a/models/base/pg_user.sql b/models/base/pg_user.sql
@@ -3,4 +3,4 @@ select
   usesysid as user_id
 , usename as username
 
-from pg_user
+from pg_catalog.pg_user
diff --git a/models/base/pg_views.sql b/models/base/pg_views.sql
@@ -2,4 +2,4 @@ select
   schemaname as schema_name
 , viewname as view_name
 , viewowner as view_owner
-from pg_views
+from pg_catalog.pg_views
diff --git a/models/base/stl_explain.sql b/models/base/stl_explain.sql
@@ -7,4 +7,4 @@ select
 , plannode
 , info
 
-from stl_explain
+from pg_catalog.stl_explain
diff --git a/models/base/stl_query.sql b/models/base/stl_query.sql
@@ -10,4 +10,4 @@ select
 , endtime as finished_at
 , aborted
 
-from stl_query
+from pg_catalog.stl_query
diff --git a/models/base/stl_wlm_query.sql b/models/base/stl_wlm_query.sql
@@ -16,4 +16,4 @@ select
 , service_class_end_time
 , final_state
 
-from stl_wlm_query
+from pg_catalog.stl_wlm_query
diff --git a/models/base/stv_blocklist.sql b/models/base/stv_blocklist.sql
@@ -21,4 +21,4 @@ select
 , num_readers
 , id
 , flags
-from stv_blocklist
+from pg_catalog.stv_blocklist
diff --git a/models/base/stv_partitions.sql b/models/base/stv_partitions.sql
@@ -0,0 +1,20 @@
+select
+
+  owner
+, host
+, diskno
+, part_begin
+, part_end
+, used
+, tossed
+, capacity
+, "reads"
+, writes
+, seek_forward
+, seek_back
+, is_san
+, failed
+, mbps
+, mount
+
+from pg_catalog.stv_partitions
diff --git a/models/base/stv_tbl_perm.sql b/models/base/stv_tbl_perm.sql
@@ -8,4 +8,4 @@ select
 , temp
 , db_id
 , backup
-from stv_tbl_perm
+from pg_catalog.stv_tbl_perm
diff --git a/models/base/svv_diskusage.sql b/models/base/svv_diskusage.sql
@@ -23,4 +23,4 @@ select
 , num_readers
 , id
 , flags
-from svv_diskusage
+from pg_catalog.svv_diskusage
diff --git a/models/views/redshift_admin_table_stats.sql b/models/views/redshift_admin_table_stats.sql
@@ -52,8 +52,7 @@ with unsorted_by_table as (
 
   select
     sum(capacity) as total_megabytes
-  from
-  stv_partitions
+  from {{ref('stv_partitions')}}
   where part_begin=0
 
 ), table_distribution_ratio as (
