From d05683d132b9634df6f2f04492a8a340487ee6be Mon Sep 17 00:00:00 2001 From: Emily Rockman Date: Fri, 14 Jun 2024 08:36:54 -0500 Subject: [PATCH] consolidate renaming --- .circleci/config.yml | 2 +- integration_tests/.env/postgres.env | 2 +- integration_tests/.env/redshift.env | 2 +- integration_tests/ci/sample.profiles.yml | 4 ++-- tox.ini | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 7ddc50e8..07ba64d4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,7 +14,7 @@ jobs: POSTGRES_TEST_USER: root DBT_ENV_SECRET_POSTGRES_TEST_PASS: '' POSTGRES_TEST_PORT: 5432 - POSTGRES_TEST_DBNAME: circle_test + POSTGRES_TEST_DATABASE: circle_test POSTGRES_TEST_SCHEMA: dbt_utils_integration_tests_postgres steps: diff --git a/integration_tests/.env/postgres.env b/integration_tests/.env/postgres.env index f0ec34b6..3728a84a 100644 --- a/integration_tests/.env/postgres.env +++ b/integration_tests/.env/postgres.env @@ -2,5 +2,5 @@ POSTGRES_TEST_HOST=localhost POSTGRES_TEST_USER=root DBT_ENV_SECRET_POSTGRES_TEST_PASS='' POSTGRES_TEST_PORT=5432 -POSTGRES_TEST_DBNAME=circle_test +POSTGRES_TEST_DATABASE=circle_test POSTGRES_TEST_SCHEMA=dbt_utils_integration_tests_postgres diff --git a/integration_tests/.env/redshift.env b/integration_tests/.env/redshift.env index f50d6425..86e322f7 100644 --- a/integration_tests/.env/redshift.env +++ b/integration_tests/.env/redshift.env @@ -1,6 +1,6 @@ REDSHIFT_TEST_HOST= REDSHIFT_TEST_USER= DBT_ENV_SECRET_REDSHIFT_TEST_PASS= -REDSHIFT_TEST_DBNAME= +REDSHIFT_TEST_DATABASE= REDSHIFT_TEST_PORT= REDSHIFT_TEST_SCHEMA=dbt_utils_integration_tests_redshift \ No newline at end of file diff --git a/integration_tests/ci/sample.profiles.yml b/integration_tests/ci/sample.profiles.yml index bbe07422..e44e1aee 100644 --- a/integration_tests/ci/sample.profiles.yml +++ b/integration_tests/ci/sample.profiles.yml @@ -15,7 +15,7 @@ integration_tests: user: "{{ env_var('POSTGRES_TEST_USER') }}" pass: "{{ env_var('DBT_ENV_SECRET_POSTGRES_TEST_PASS') }}" port: "{{ env_var('POSTGRES_TEST_PORT') | as_number }}" - dbname: "{{ env_var('POSTGRES_TEST_DBNAME') }}" + dbname: "{{ env_var('POSTGRES_TEST_DATABASE') }}" schema: "{{ env_var('POSTGRES_TEST_SCHEMA') }}" threads: 5 @@ -24,7 +24,7 @@ integration_tests: host: "{{ env_var('REDSHIFT_TEST_HOST') }}" user: "{{ env_var('REDSHIFT_TEST_USER') }}" pass: "{{ env_var('DBT_ENV_SECRET_REDSHIFT_TEST_PASS') }}" - dbname: "{{ env_var('REDSHIFT_TEST_DBNAME') }}" + dbname: "{{ env_var('REDSHIFT_TEST_DATABASE') }}" port: "{{ env_var('REDSHIFT_TEST_PORT') | as_number }}" schema: "{{ env_var('REDSHIFT_TEST_SCHEMA') }}" threads: 5 diff --git a/tox.ini b/tox.ini index cdf3a590..302354b4 100644 --- a/tox.ini +++ b/tox.ini @@ -13,7 +13,7 @@ passenv = POSTGRES_TEST_USER DBT_ENV_SECRET_POSTGRES_TEST_PASS POSTGRES_TEST_PORT - POSTGRES_TEST_DBNAME + POSTGRES_TEST_DATABASE POSTGRES_TEST_SCHEMA # snowflake env vars SNOWFLAKE_TEST_ACCOUNT