Postgres implemented

gnosischain · Oct 17, 2024 · b206335 · b206335
1 parent c184321
commit b206335
Show file tree

Hide file tree

Showing 34 changed files with 396 additions and 700 deletions.
diff --git a/.env.test b/.env.test
@@ -2,4 +2,9 @@ CLICKHOUSE_URL
 CLICKHOUSE_PORT
 CLICKHOUSE_USER
 CLICKHOUSE_PASSWORD
-CLICKHOUSE_SECURE
+CLICKHOUSE_SECURE
+
+POSTGRES_URL
+POSTGRES_PORT
+POSTGRES_USER
+POSTGRES_PASSWORD
diff --git a/Dockerfile b/Dockerfile
@@ -27,6 +27,9 @@ RUN pip install --user -r /app/requirements.txt
 # Copy dbt project
 COPY dbt_project.yml /app/dbt_project.yml
 
+# Copy profiles.yml to the .dbt directory in the user's home
+COPY profiles.yml /home/appuser/.dbt/profiles.yml
+
 # Copy macros, models and seeds
 COPY /macros /app/macros
 COPY /models /app/models
@@ -43,4 +46,4 @@ ENV DBT_PROJECT_PATH /app/src
 EXPOSE 8080
 
 # Set PATH to include user-level binaries
-ENV PATH=/home/appuser/.local/bin:$PATH
+ENV PATH=/home/appuser/.local/bin:$PATH
diff --git a/README.md b/README.md
@@ -17,6 +17,9 @@ This dbt project is designed to facilitate the transformation and analysis of Gn
 - `seeds/`: Seed files that contain static data used as inputs for models.
 
 
+```
+docker exec -it dbt /bin/bash 
+```
 
 
 ## Contributing

diff --git a/dbt_project.yml b/dbt_project.yml
@@ -2,7 +2,7 @@ name: 'gnosis_dbt'
 version: '1.0.0'
 config-version: 2
 
-profile: 'gnosis_dbt'  # This should match the profile name in profiles.yml
+profile: 'gnosis_dbt'
 
 model-paths: ["models"]
 analysis-paths: ["analyses"]

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -18,17 +18,19 @@ services:
       CLICKHOUSE_URL: ${CLICKHOUSE_URL}
       CLICKHOUSE_PORT: ${CLICKHOUSE_PORT}
       CLICKHOUSE_SECURE: ${CLICKHOUSE_SECURE}
+      POSTGRES_URL: ${POSTGRES_URL}
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - type: bind
         source: ./
         target: /app
         consistency: cached
-      - ./profiles.yml:/home/appuser/.dbt/profiles.yml
     working_dir: /app
     user: appuser
     networks:
       - dbt_net
 
-
 networks:
-  dbt_net:
+  dbt_net:
diff --git a/macros/consensus/_postgresql/create_bytea_to_bigint_function.sql b/macros/consensus/_postgresql/create_bytea_to_bigint_function.sql
diff --git a/macros/consensus/_postgresql/create_deserialize_eth2_function.sql b/macros/consensus/_postgresql/create_deserialize_eth2_function.sql
diff --git a/macros/consensus/bytea_to_bigint.sql b/macros/consensus/bytea_to_bigint.sql
diff --git a/macros/consensus/deserialize_eth2.sql b/macros/consensus/deserialize_eth2.sql
diff --git a/macros/consensus/node_count_over_time.sql b/macros/consensus/node_count_over_time.sql
diff --git a/macros/consensus/node_count_over_time_old.sql b/macros/consensus/node_count_over_time_old.sql
diff --git a/macros/db/clickhouse_utils.sql b/macros/db/clickhouse_utils.sql
@@ -0,0 +1,17 @@
+{% macro generate_schema_name(custom_schema_name, node) -%}
+    {%- set default_schema = target.schema -%}
+    {%- if custom_schema_name is none -%}
+        {{ default_schema }}
+    {%- else -%}
+        {{ custom_schema_name | trim }}
+    {%- endif -%}
+{%- endmacro %}
+
+{% macro generate_database_name(custom_database_name, node) -%}
+    {%- set default_database = target.schema -%}
+    {%- if custom_database_name is none -%}
+        {{ default_database }}
+    {%- else -%}
+        {{ custom_database_name | trim }}
+    {%- endif -%}
+{%- endmacro %}
-Original file line number
+Diff line change
@@ Expand Up @@
     - `seeds/`: Seed files that contain static data used as inputs for models.
+    ```
+    docker exec -it dbt /bin/bash
+    ```
     ## Contributing
@@ Expand Down @@