Skip to content

Commit

Permalink
Merge pull request #105 from snowplow/release/mobile/snowflake/1.1.0
Browse files Browse the repository at this point in the history 
Release/mobile/snowflake/1.1.0
  • Loading branch information
@bill-warner
bill-warner authored Jun 16, 2021
2 parents ead84ed + 2859a42 commit a0e2f32
Show file tree
Hide file tree
Showing 34 changed files with 54 additions and 41 deletions.
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion .test/great_expectations/expectations/mobile/v1/mobile_base_redshift.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_screen_view_in_session_values.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_screen_views.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_sessions.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_staging_reconciliation.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
4 changes: 2 additions & 2 deletions .test/great_expectations/expectations/mobile/v1/mobile_users.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
6 changes: 6 additions & 0 deletions mobile/v1/snowflake/CHANGELOG
View file
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion .../v1/snowflake/sql-runner/playbooks/custom/04-session-goals/01-session-goals-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion ...snowflake/sql-runner/playbooks/custom/04-session-goals/99-session-goals-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/00-setup-metadata.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/99-metadata-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/00-setup/XX-destroy-metadata.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/01-base-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/99-base-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/01-base/XX-destroy-base.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .../v1/snowflake/sql-runner/playbooks/standard/02-screen-views/01-screen-views-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...snowflake/sql-runner/playbooks/standard/02-screen-views/99-screen-views-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion .../snowflake/sql-runner/playbooks/standard/02-screen-views/XX-destroy-screen-views.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion ...l-runner/playbooks/standard/03-optional-modules/01-app-errors/01-app-errors-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...nner/playbooks/standard/03-optional-modules/01-app-errors/99-app-errors-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion ...unner/playbooks/standard/03-optional-modules/01-app-errors/XX-destroy-app-errors.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/01-sessions-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/99-sessions-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/04-sessions/XX-destroy-sessions.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/01-users-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/99-users-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion mobile/v1/snowflake/sql-runner/playbooks/standard/05-users/XX-destroy-users.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion ...-runner/playbooks/tests/00-staging-reconciliation/01-staging-reconciliation-main.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
2 changes: 1 addition & 1 deletion ...ner/playbooks/tests/00-staging-reconciliation/99-staging-reconciliation-complete.yml.tmpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: ""
Expand Down
6 changes: 3 additions & 3 deletions mobile/v1/snowflake/sql-runner/sql/standard/00-setup/01-main/01-stored-procedures.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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 */
Expand Down
3 changes: 2 additions & 1 deletion mobile/v1/snowflake/sql-runner/sql/standard/01-base/01-main/06-events-this-run.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a0e2f32

Please sign in to comment.