PR feedback

Author: erindru

.circleci/test_migration.sh

@@ -1,11 +1,6 @@
 #!/usr/bin/env bash
 set -ex
 
-GATEWAY_NAME="duckdb_persistent"
-TMP_DIR=$(mktemp -d)
-SUSHI_DIR="$TMP_DIR/sushi"
-
-
 if [[ -z $(git tag --points-at HEAD) ]]; then
     # If the current commit is not tagged, we need to find the last tag
     LAST_TAG=$(git describe --tags --abbrev=0)
@@ -14,28 +9,46 @@ else
     LAST_TAG=$(git tag --sort=-creatordate | head -n 2 | tail -n 1)
 fi
 
-git checkout $LAST_TAG
+function run_migration_test {
+    TMP_DIR=$(mktemp -d)
+    EXAMPLE_NAME="$1"
+    SQLMESH_OPTS="$2"
+    EXAMPLE_DIR="./examples/$EXAMPLE_NAME"
+    TEST_DIR="$TMP_DIR/$EXAMPLE_NAME"
+
+    echo "Running migration test for '$EXAMPLE_NAME' in '$TEST_DIR' for example project '$EXAMPLE_DIR' using options '$SQLMESH_OPTS'"
+
+    git checkout $LAST_TAG
+
+    # Install dependencies from the previous release.
+    make install-dev
+
+    cp -r $EXAMPLE_DIR $TEST_DIR
 
-# Install dependencies from the previous release.
-make install-dev
+    # this is only needed temporarily until the released tag for $LAST_TAG includes this config
+    if [ "$EXAMPLE_NAME" == "sushi_dbt" ]; then
+        echo 'migration_test_config = sqlmesh_config(Path(__file__).parent, dbt_target_name="duckdb")' >> $TEST_DIR/config.py
+    fi    
 
-cp -r ./examples/sushi $TMP_DIR
+    # Run initial plan
+    pushd $TEST_DIR
+    rm -rf ./data/*
+    sqlmesh $SQLMESH_OPTS plan --no-prompts --auto-apply
+    rm -rf .cache
+    popd
 
-# Run initial plan
-pushd $SUSHI_DIR
-rm -rf ./data/*
-sqlmesh --gateway $GATEWAY_NAME plan --no-prompts --auto-apply
-rm -rf .cache
-popd
+    # Switch back to the starting state of the repository    
+    git checkout -
 
-# Switch back to the starting state of the repository
-git checkout -
+    # Install updated dependencies.
+    make install-dev
 
-# Install updated dependencies.
-make install-dev
+    # Migrate and make sure the diff is empty
+    pushd $TEST_DIR
+    sqlmesh $SQLMESH_OPTS migrate
+    sqlmesh $SQLMESH_OPTS diff prod
+    popd
+}
 
-# Migrate and make sure the diff is empty
-pushd $SUSHI_DIR
-sqlmesh --gateway $GATEWAY_NAME migrate
-sqlmesh --gateway $GATEWAY_NAME diff prod
-popd
+run_migration_test "sushi" "--gateway duckdb_persistent"
+run_migration_test "sushi_dbt" "--config migration_test_config"

examples/sushi_dbt/config.py

@@ -5,3 +5,5 @@
 config = sqlmesh_config(Path(__file__).parent)
 
 test_config = config
+
+migration_test_config = sqlmesh_config(Path(__file__).parent, dbt_target_name="duckdb")

sqlmesh/core/node.py

@@ -183,7 +183,7 @@ class DbtNodeInfo(PydanticModel):
 
     fqn: str
     """Used for selectors in --select/--exclude.
-    Takes the filesystem into account so may be structured differently to :resource_name.
+    Takes the filesystem into account so may be structured differently to :unique_id.
     
     Examples:
         - jaffle_shop.staging.unique_stg_orders_order_id