fix joins (#146)

Author: maskarb

kokudaily/sql/key_metrics/cust_cloud_costs_data_setup.sql

@@ -27,7 +27,12 @@ INSERT INTO __cust_cloud_cost_report (
     gcp_total,
     oci_cost
 )
-WITH aws_costs_currencies AS (
+WITH schemas AS (
+    SELECT
+        ''%%1$s'' AS "customer",
+        generate_series(date_trunc(''month'', ''%%2$s''::date), now(), ''1 day'')::date AS "date"
+),
+aws_costs_currencies AS (
     SELECT
         ''%%1$s'' AS "customer",
         usage_start AS "date",
@@ -120,16 +125,17 @@ oci_costs AS (
     GROUP BY date
 )
 SELECT
-    awc.customer AS "schema",
-    date AS "date",
+    s.customer AS "schema",
+    s.date AS "date",
     awc.aws_unblended_cost AS "aws_unblended_cost",
     awc.aws_calculated_amortized_cost AS "aws_calculated_amortized_cost",
     azc.azure_pretax_cost AS "azure_pretax_cost",
     gc.gcp_unblended_cost AS "gcp_unblended_cost",
     gc.gcp_total AS "gcp_total",
     oc.oci_cost AS "oci_cost"
 FROM
-    aws_costs awc
+    schemas s
+    FULL OUTER JOIN aws_costs awc USING (customer, date)
     FULL OUTER JOIN azure_costs azc USING (customer, date)
     FULL OUTER JOIN gcp_costs gc USING (customer, date)
     FULL OUTER JOIN oci_costs oc USING (customer, date)

kokudaily/sql/key_metrics/cust_openshift_costs_data_setup.sql

@@ -35,7 +35,12 @@ INSERT INTO __cust_openshift_cost_report (
     sup_cost_model_memory_cost,
     sup_cost_model_volume_cost
 )
-WITH infra_raw_currencies AS (
+WITH schemas AS (
+    SELECT
+        ''%%1$s'' AS "customer",
+        generate_series(date_trunc(''month'', ''%%2$s''::date), now(), ''1 day'')::date AS "date"
+),
+infra_raw_currencies AS (
     SELECT
         ''%%1$s'' AS "customer",
         usage_start AS "date",
@@ -122,8 +127,8 @@ sup_costs AS (
     GROUP BY date
 )
 SELECT
-    ir.customer AS "schema",
-    date AS "date",
+    s.customer AS "schema",
+    s.date AS "date",
     COALESCE(ir.infrastructure_raw_cost, 0) AS "total_infrastructure_raw_cost",
     ic.infra_total_cost_model+sc.sup_total_cost_model AS "total_cost_model_costs",
     ic.infra_total_cost_model AS "infra_total_cost_model",
@@ -135,7 +140,8 @@ SELECT
     sc.sup_cost_model_memory_cost AS "sup_cost_model_memory_cost",
     sc.sup_cost_model_volume_cost AS "sup_cost_model_volume_cost"
 FROM
-    infra_costs ic
+    schemas s
+    FULL OUTER JOIN infra_costs ic USING (customer, date)
     FULL OUTER JOIN infra_raw ir USING (customer, date)
     FULL OUTER JOIN sup_costs sc USING (customer, date)
 ORDER BY date

kokudaily/sql/key_metrics/cust_openshift_infra_data_setup.sql

@@ -55,7 +55,12 @@ INSERT INTO __cust_openshift_infra_report (
     pvc_capacity_gb,
     pvc_capacity_gb_mo
 )
-with node_info as (
+WITH schemas AS (
+    SELECT
+        ''%%1$s'' AS "customer",
+        generate_series(date_trunc(''month'', ''%%2$s''::date), now(), ''1 day'')::date AS "date"
+),
+node_info as (
     SELECT
         ron.node AS node,
         ron.node_role AS node_role,
@@ -162,8 +167,8 @@ storage_agg AS (
     GROUP BY date
 )
 SELECT
-    customer AS "schema",
-    date,
+    s.customer AS "schema",
+    s.date,
     cluster_count,
     node_count,
     infra_node_count,
@@ -184,9 +189,11 @@ SELECT
     volume_request_gb_mo,
     pvc_capacity_gb,
     pvc_capacity_gb_mo
-FROM compute_agg c
-FULL OUTER JOIN storage_agg s USING (customer, date)
-FULL OUTER JOIN node_counts n USING (customer, date)
+FROM
+schemas s
+FULL OUTER JOIN compute_agg ca USING (customer, date)
+FULL OUTER JOIN storage_agg sa USING (customer, date)
+FULL OUTER JOIN node_counts nc USING (customer, date)
 ORDER BY date
 ';
 BEGIN