feat: migrate aspects dictionaries to dbt

openedx · Apr 8, 2024 · bb872d1 · bb872d1
1 parent 768df58
commit bb872d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/tutoraspects/plugin.py b/tutoraspects/plugin.py
@@ -379,7 +379,7 @@
         # For now we are pulling this from github, which should allow maximum
         # flexibility for forking, running branches, specific versions, etc.
         ("DBT_REPOSITORY", "https://github.com/openedx/aspects-dbt"),
-        ("DBT_BRANCH", "v3.12.0"),
+        ("DBT_BRANCH", "cag/migrate-dictionaries"),
         ("DBT_SSH_KEY", ""),
         ("DBT_STATE_DIR", "/app/aspects/dbt_state/"),
         # This is a pip compliant list of Python packages to install to run dbt

diff --git a/tutoraspects/templates/aspects/apps/aspects/dbt/profiles.yml b/tutoraspects/templates/aspects/apps/aspects/dbt/profiles.yml
@@ -5,7 +5,7 @@ aspects: # this needs to match the profile in your dbt_project.yml file
       type: clickhouse
       schema: {{ DBT_PROFILE_TARGET_DATABASE }}
       host: {{ CLICKHOUSE_HOST }}
-      port: {{ CLICKHOUSE_INTERNAL_HTTP_PORT }}
+      port: {{ CLICKHOUSE_INTERNAL_NATIVE_PORT }}
       user: {{ CLICKHOUSE_ADMIN_USER }}
       password: '{{ CLICKHOUSE_ADMIN_PASSWORD }}'
       cluster: {{ CLICKHOUSE_CLUSTER_NAME }}

diff --git a/...bic/versions/0034_migrate_dictionaries.py → ...bic/versions/0035_migrate_dictionaries.py b/...bic/versions/0034_migrate_dictionaries.py → ...bic/versions/0035_migrate_dictionaries.py
@@ -4,8 +4,8 @@
 from alembic import op
 
 
-revision = "0034"
-down_revision = "0033"
+revision = "0035"
+down_revision = "0034"
 branch_labels = None
 depends_on = None
 on_cluster = " ON CLUSTER '{{CLICKHOUSE_CLUSTER_NAME}}' " if "{{CLICKHOUSE_CLUSTER_NAME}}" else ""
@@ -18,7 +18,7 @@
 def upgrade():
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii
         {on_cluster}
         """
     )
@@ -30,7 +30,7 @@ def upgrade():
     )
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
         {on_cluster}
         """
     )
@@ -42,7 +42,7 @@ def upgrade():
     )
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names
         {on_cluster}
         """
     )
@@ -61,7 +61,7 @@ def downgrade():
     ## Course Names
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.user_pii
         {on_cluster}
         """
     )
@@ -73,7 +73,7 @@ def downgrade():
     )
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_block_names
         {on_cluster}
         """
     )
@@ -85,7 +85,7 @@ def downgrade():
     )
     op.execute(
         f"""
-        DROP TABLE IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names
+        DROP DICTIONARY IF EXISTS {{ ASPECTS_EVENT_SINK_DATABASE }}.course_names
         {on_cluster}
         """
     )