Skip to content

Commit 2c5f558

Browse files
Merge branch 'master' into fix/add-columns
2 parents 58200d2 + 3e6457c commit 2c5f558

File tree

5 files changed

+23
-11
lines changed

5 files changed

+23
-11
lines changed

.devcontainer/devcontainer.json

+19-9
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,21 @@
11
{
2-
"name": "Python 3",
3-
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
4-
"features": {
5-
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
6-
},
7-
"postStartCommand": "bash .devcontainer/setup_odbc.sh && bash .devcontainer/install_pyenv.sh && bash .devcontainer/setup_env.sh",
8-
"runArgs": [
9-
"--env-file", "${localWorkspaceFolder}/.devcontainer/test.env"
10-
]
2+
"name": "Python 3",
3+
"image": "mcr.microsoft.com/devcontainers/python:1-3.10-bookworm",
4+
"features": {
5+
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
6+
},
7+
"postStartCommand": "sudo bash .devcontainer/setup_odbc.sh && bash .devcontainer/install_pyenv.sh && bash .devcontainer/setup_env.sh",
8+
"containerEnv": {
9+
"SQLSERVER_TEST_DRIVER": "ODBC Driver 18 for SQL Server",
10+
"SQLSERVER_TEST_HOST": "127.0.0.1",
11+
"SQLSERVER_TEST_USER": "SA",
12+
"SQLSERVER_TEST_PASS": "L0calTesting!",
13+
"SQLSERVER_TEST_PORT": "1433",
14+
"SQLSERVER_TEST_DBNAME": "TestDB",
15+
"SQLSERVER_TEST_ENCRYPT": "true",
16+
"SQLSERVER_TEST_TRUST_CERT": "true",
17+
"DBT_TEST_USER_1": "DBT_TEST_USER_1",
18+
"DBT_TEST_USER_2": "DBT_TEST_USER_2",
19+
"DBT_TEST_USER_3": "DBT_TEST_USER_3"
20+
}
1121
}

.devcontainer/setup_env.sh

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
cp test.env.sample test.env
2+
13
pyenv install 3.10.7
24
pyenv virtualenv 3.10.7 dbt-sqlserver
35
pyenv activate dbt-sqlserver

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.txt text eol=lf

dbt/adapters/sqlserver/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version = "1.7.3"
1+
version = "1.7.4"

dbt/include/sqlserver/macros/materializations/models/table/create_table_as.sql

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ SQL Server doesnt support this, so we use the 'SELECT * INTO XYZ FROM ABC' synta
99
path={"identifier": relation.identifier.replace("#", "") ~ '_temp_view'},
1010
type='view')-%}
1111
{% do run_query(fabric__drop_relation_script(tmp_relation)) %}
12-
{% do run_query(fabric__drop_relation_script(relation)) %}
1312

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

0 commit comments

Comments
 (0)