Skip to content

Commit

Permalink
Merge pull request #489 from cody-scott/488-updates
Browse files Browse the repository at this point in the history
488 updates
  • Loading branch information
schlich committed Mar 4, 2024
2 parents 37654e1 + 57d13b5 commit 3e6457c
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 11 deletions.
28 changes: 19 additions & 9 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
{
"name": "Python 3",
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"postStartCommand": "bash .devcontainer/setup_odbc.sh && bash .devcontainer/install_pyenv.sh && bash .devcontainer/setup_env.sh",
"runArgs": [
"--env-file", "${localWorkspaceFolder}/.devcontainer/test.env"
]
"name": "Python 3",
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"postStartCommand": "sudo bash .devcontainer/setup_odbc.sh && bash .devcontainer/install_pyenv.sh && bash .devcontainer/setup_env.sh",
"containerEnv": {
"SQLSERVER_TEST_DRIVER": "ODBC Driver 18 for SQL Server",
"SQLSERVER_TEST_HOST": "127.0.0.1",
"SQLSERVER_TEST_USER": "SA",
"SQLSERVER_TEST_PASS": "L0calTesting!",
"SQLSERVER_TEST_PORT": "1433",
"SQLSERVER_TEST_DBNAME": "TestDB",
"SQLSERVER_TEST_ENCRYPT": "true",
"SQLSERVER_TEST_TRUST_CERT": "true",
"DBT_TEST_USER_1": "DBT_TEST_USER_1",
"DBT_TEST_USER_2": "DBT_TEST_USER_2",
"DBT_TEST_USER_3": "DBT_TEST_USER_3"
}
}
2 changes: 2 additions & 0 deletions .devcontainer/setup_env.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cp test.env.sample test.env

pyenv install 3.10.7
pyenv virtualenv 3.10.7 dbt-sqlserver
pyenv activate dbt-sqlserver
Expand Down
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.txt text eol=lf
2 changes: 1 addition & 1 deletion dbt/adapters/sqlserver/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version = "1.7.3"
version = "1.7.4"
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ SQL Server doesnt support this, so we use the 'SELECT * INTO XYZ FROM ABC' synta
path={"identifier": relation.identifier.replace("#", "") ~ '_temp_view'},
type='view')-%}
{% do run_query(fabric__drop_relation_script(tmp_relation)) %}
{% do run_query(fabric__drop_relation_script(relation)) %}

{% set contract_config = config.get('contract') %}

Expand Down

0 comments on commit 3e6457c

Please sign in to comment.