Merge pull request #105 from snowplow/release/mobile/snowflake/1.1.0

bill-warner · web-flow · commit a0e2f32f344c · 2021-06-16T14:11:49.000+03:00
Release/mobile/snowflake/1.1.0
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_base.json b/.test/great_expectations/expectations/mobile/v1/mobile_base.json
@@ -137,9 +137,9 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
   }
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_base_redshift.json b/.test/great_expectations/expectations/mobile/v1/mobile_base_redshift.json
@@ -248,7 +248,7 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_metadata.json b/.test/great_expectations/expectations/mobile/v1/mobile_metadata.json
@@ -102,10 +102,10 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
   }
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_screen_view_in_session_values.json b/.test/great_expectations/expectations/mobile/v1/mobile_screen_view_in_session_values.json
@@ -26,10 +26,10 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
   }
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_screen_views.json b/.test/great_expectations/expectations/mobile/v1/mobile_screen_views.json
@@ -166,10 +166,10 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
   }
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_sessions.json b/.test/great_expectations/expectations/mobile/v1/mobile_sessions.json
@@ -154,10 +154,10 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
   }
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_staging_reconciliation.json b/.test/great_expectations/expectations/mobile/v1/mobile_staging_reconciliation.json
@@ -87,10 +87,10 @@
   "meta": {
     "great_expectations.__version__": "0.12.0",
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     }
   }
 }
diff --git a/.test/great_expectations/expectations/mobile/v1/mobile_users.json b/.test/great_expectations/expectations/mobile/v1/mobile_users.json
@@ -113,10 +113,10 @@
   ],
   "meta": {
     "versions": {
-      "test_suite_version": "1.0.3",
+      "test_suite_version": "1.0.4",
       "redshift_model_version": "1.1.0",
       "bigquery_model_version": "1.1.0",
-      "snowflake_model_version": "1.0.0"
+      "snowflake_model_version": "1.1.0"
     },
     "great_expectations.__version__": "0.12.0"
   }
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+Snowflake Mobile Version 1.1.0 (2021-06-16)
+---------------------------------------
+Snowflake Mobile: Update update_manifest to throw error message (Close #104)
+Snowflake Mobile: Update commit_table procedure to throw error messages (Close #103)
+Snowflake Mobile: Fix column order in events_this_run to allow for events_staged table migration (Close #102)
+
 BigQuery Mobile Version 1.1.0 (2021-06-15)
 ---------------------------------------
 BigQuery Mobile: Add mobile_staging_reconcilition to temp tables validation config (Close #100)
diff --git a/mobile/v1/snowflake/CHANGELOG b/mobile/v1/snowflake/CHANGELOG
@@ -1,3 +1,9 @@
+Version 1.1.0 (2021-06-16)
+--------------------------
+Snowflake Mobile: Update update_manifest to throw error message (Close #104)
+Snowflake Mobile: Update commit_table procedure to throw error messages (Close #103)
+Snowflake Mobile: Fix column order in events_this_run to allow for events_staged table migration (Close #102)
+
 Version 1.0.0 (2021-05-06)
 --------------------------
 Add Snowflake mobile model v1 (Close #85)
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/custom/04-session-goals/01-session-goals-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/custom/04-session-goals/01-session-goals-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:           snowflake/mobile/1.0.0
+  :model_version:           snowflake/mobile/1.1.0
   :scratch_schema:          scratch
   :output_schema:           derived
   :entropy:                 ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/custom/04-session-goals/99-session-goals-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/custom/04-session-goals/99-session-goals-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:           snowflake/mobile/1.0.0
+  :model_version:           snowflake/mobile/1.1.0
   :scratch_schema:          scratch
   :entropy:                 ""
 :steps:
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/00-setup-metadata.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/00-setup-metadata.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :output_schema:      derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/99-metadata-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/99-metadata-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :output_schema:      derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/XX-destroy-metadata.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/XX-destroy-metadata.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :output_schema:      derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/01-base-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/01-base-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:           snowflake/mobile/1.0.0
+  :model_version:           snowflake/mobile/1.1.0
   :model:                   mobile
   :input_schema:            atomic
   :scratch_schema:          scratch
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/99-base-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/99-base-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :output_schema:      derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/XX-destroy-base.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/XX-destroy-base.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :output_schema:      derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/02-screen-views/01-screen-views-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/02-screen-views/01-screen-views-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:        snowflake/mobile/1.0.0
+  :model_version:        snowflake/mobile/1.1.0
   :model:                mobile
   :scratch_schema:       scratch
   :output_schema:        derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/02-screen-views/99-screen-views-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/02-screen-views/99-screen-views-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/02-screen-views/XX-destroy-screen-views.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/02-screen-views/XX-destroy-screen-views.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/03-optional-modules/01-app-errors/01-app-errors-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/03-optional-modules/01-app-errors/01-app-errors-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:        snowflake/mobile/1.0.0
+  :model_version:        snowflake/mobile/1.1.0
   :model:                mobile
   :scratch_schema:       scratch
   :output_schema:        derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/03-optional-modules/01-app-errors/99-app-errors-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/03-optional-modules/01-app-errors/99-app-errors-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/03-optional-modules/01-app-errors/XX-destroy-app-errors.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/03-optional-modules/01-app-errors/XX-destroy-app-errors.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/01-sessions-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/01-sessions-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:        snowflake/mobile/1.0.0
+  :model_version:        snowflake/mobile/1.1.0
   :model:                mobile
   :scratch_schema:       scratch
   :output_schema:        derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/99-sessions-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/99-sessions-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/XX-destroy-sessions.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/XX-destroy-sessions.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/01-users-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/01-users-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :output_schema:      derived
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/99-users-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/99-users-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/XX-destroy-users.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/XX-destroy-users.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :scratch_schema:     scratch
   :output_schema:      derived
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/tests/00-staging-reconciliation/01-staging-reconciliation-main.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/tests/00-staging-reconciliation/01-staging-reconciliation-main.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/playbooks/tests/00-staging-reconciliation/99-staging-reconciliation-complete.yml.tmpl b/mobile/v1/snowflake/sql-runner/playbooks/tests/00-staging-reconciliation/99-staging-reconciliation-complete.yml.tmpl
@@ -7,7 +7,7 @@
   :username:
   :password:
 :variables:
-  :model_version:      snowflake/mobile/1.0.0
+  :model_version:      snowflake/mobile/1.1.0
   :model:              mobile
   :scratch_schema:     scratch
   :entropy:            ""
diff --git a/mobile/v1/snowflake/sql-runner/sql/standard/00-setup/01-main/01-stored-procedures.sql b/mobile/v1/snowflake/sql-runner/sql/standard/00-setup/01-main/01-stored-procedures.sql
@@ -68,7 +68,7 @@ CREATE OR REPLACE PROCEDURE {{.output_schema}}.update_manifest(MODULE VARCHAR)
       dmls = [users_manifest_delete, users_manifest_insert, users_manifest_truncate];
   }
   else {
-      return "No manifest updated. Pass either 'base' or 'users' to update the manifests within that module";
+      throw "No manifest updated. Pass either 'base' or 'users' to update the manifests within that module";
   }
 
   snowflake.createStatement({sqlText: `BEGIN;`}).execute();
@@ -257,10 +257,10 @@ CREATE OR REPLACE PROCEDURE {{.output_schema}}.commit_table(SOURCE_SCHEMA VARCHA
   [missing_in_source, missing_in_target, columns_to_add] = cols_checker_array.getColumnValue(1);
 
   if (missing_in_source > 0) {
-      return "ERROR: Source table is missing column(s) which exist in target table."
+      throw "ERROR: Source table is missing column(s) which exist in target table.";
   }
   else if (missing_in_target > 0 && !AUTOMIGRATE) {
-      return "ERROR: Target table is missing column(s), but automigrate is disabled."
+      throw "ERROR: Target table is missing column(s), but automigrate is disabled.";
   }
   else if (missing_in_target > 0 && AUTOMIGRATE) {
       /* Alter table if AUTOMIGRATE enabled */
diff --git a/mobile/v1/snowflake/sql-runner/sql/standard/01-base/01-main/06-events-this-run.sql b/mobile/v1/snowflake/sql-runner/sql/standard/01-base/01-main/06-events-this-run.sql
@@ -143,8 +143,9 @@ AS (
   )
 
   SELECT
+    {{if eq .model "mobile"}} ROW_NUMBER() OVER(PARTITION BY d.session_id ORDER BY d.derived_tstamp) AS event_index_in_session, {{end}}
     d.*
-    {{if eq .model "mobile"}} , ROW_NUMBER() OVER(PARTITION BY d.session_id ORDER BY d.derived_tstamp) AS event_index_in_session {{end}}
+    
 
   FROM
     deduped_events d

Original file line number	Diff line number	Diff line change
`@@ -87,10 +87,10 @@`
`87`	`87`	`"meta": {`
`88`	`88`	`"great_expectations.__version__": "0.12.0",`
`89`	`89`	`"versions": {`
`90`		`- "test_suite_version": "1.0.3",`
	`90`	`+ "test_suite_version": "1.0.4",`
`91`	`91`	`"redshift_model_version": "1.1.0",`
`92`	`92`	`"bigquery_model_version": "1.1.0",`
`93`		`- "snowflake_model_version": "1.0.0"`
	`93`	`+ "snowflake_model_version": "1.1.0"`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`