Skip to content

Commit d0a5623

Browse files
author
Ty Schlichenmeyer
committed
Merge branch 'dev' of https://github.com/dbt-msft/dbt-sqlserver into dev
2 parents 7483ff1 + b69565b commit d0a5623

File tree

12 files changed

+18
-48
lines changed

12 files changed

+18
-48
lines changed

.devcontainer/devcontainer-lock.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
"integrity": "sha256:f6a73ee06601d703db7d95d03e415cab229e78df92bb5002e8559bcfc047fec6"
77
}
88
}
9-
}
9+
}

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,4 +95,4 @@ venv/
9595
ENV/
9696
env.bak/
9797
venv.bak/
98-
.mise.toml
98+
.mise.toml

dbt/adapters/sqlserver/__init__.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
from dbt.adapters.sqlserver.sql_server_adapter import SQLServerAdapter
44
from dbt.adapters.sqlserver.sql_server_column import SQLServerColumn
55
from dbt.adapters.sqlserver.sql_server_configs import SQLServerConfigs
6-
from dbt.adapters.sqlserver.sql_server_connection_manager import (
7-
SQLServerConnectionManager,
8-
)
6+
from dbt.adapters.sqlserver.sql_server_connection_manager import SQLServerConnectionManager
97
from dbt.adapters.sqlserver.sql_server_credentials import SQLServerCredentials
108
from dbt.include import sqlserver
119

dbt/adapters/sqlserver/sql_server_adapter.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33

44
from dbt.adapters.sqlserver.sql_server_column import SQLServerColumn
55
from dbt.adapters.sqlserver.sql_server_configs import SQLServerConfigs
6-
from dbt.adapters.sqlserver.sql_server_connection_manager import (
7-
SQLServerConnectionManager,
8-
)
6+
from dbt.adapters.sqlserver.sql_server_connection_manager import SQLServerConnectionManager
97

108
# from dbt.adapters.capability import Capability, CapabilityDict, CapabilitySupport, Support
119

tests/functional/adapter/test_basic.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
BaseIncrementalNotSchemaChange,
1111
)
1212
from dbt.tests.adapter.basic.test_singular_tests import BaseSingularTests
13-
from dbt.tests.adapter.basic.test_singular_tests_ephemeral import (
14-
BaseSingularTestsEphemeral,
15-
)
13+
from dbt.tests.adapter.basic.test_singular_tests_ephemeral import BaseSingularTestsEphemeral
1614
from dbt.tests.adapter.basic.test_snapshot_check_cols import BaseSnapshotCheckCols
1715
from dbt.tests.adapter.basic.test_snapshot_timestamp import BaseSnapshotTimestamp
1816
from dbt.tests.adapter.basic.test_table_materialization import BaseTableMaterialization

tests/functional/adapter/test_changing_relation_type.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
import pytest
2-
3-
from dbt.tests.adapter.relations.test_changing_relation_type import (
4-
BaseChangeRelationTypeValidator,
5-
)
2+
from dbt.tests.adapter.relations.test_changing_relation_type import BaseChangeRelationTypeValidator
63

74

85
@pytest.mark.skip(reason="CTAS is not supported without a underlying table definition.")

tests/functional/adapter/test_concurrency.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
from dbt.tests.adapter.concurrency.test_concurrency import (
2-
BaseConcurrency,
3-
seeds__update_csv,
4-
)
1+
from dbt.tests.adapter.concurrency.test_concurrency import BaseConcurrency, seeds__update_csv
52
from dbt.tests.util import (
63
check_relations_equal,
74
check_table_does_not_exist,

tests/functional/adapter/test_debug.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import pytest
55
import yaml
66
from dbt.cli.exceptions import DbtUsageException
7-
from dbt.tests.adapter.dbt_debug.test_dbt_debug import (
8-
BaseDebug,
9-
BaseDebugProfileVariable,
10-
)
7+
from dbt.tests.adapter.dbt_debug.test_dbt_debug import BaseDebug, BaseDebugProfileVariable
118
from dbt.tests.util import run_dbt
129

1310

tests/functional/adapter/test_incremental.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
from dbt.tests.adapter.incremental.test_incremental_on_schema_change import (
1414
BaseIncrementalOnSchemaChange,
1515
)
16-
from dbt.tests.adapter.incremental.test_incremental_predicates import (
17-
BaseIncrementalPredicates,
18-
)
19-
from dbt.tests.adapter.incremental.test_incremental_unique_id import (
20-
BaseIncrementalUniqueKey,
21-
)
16+
from dbt.tests.adapter.incremental.test_incremental_predicates import BaseIncrementalPredicates
17+
from dbt.tests.adapter.incremental.test_incremental_unique_id import BaseIncrementalUniqueKey
2218

2319
_MODELS__INCREMENTAL_IGNORE = """
2420
{{

tests/functional/adapter/test_seed.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,17 @@
11
import os
22

33
import pytest
4-
from dbt.tests.adapter.simple_seed.seeds import seeds__expected_sql, seed__actual_csv
54
from dbt.tests.adapter.simple_seed.fixtures import models__downstream_from_seed_actual
5+
from dbt.tests.adapter.simple_seed.seeds import seed__actual_csv, seeds__expected_sql
66
from dbt.tests.adapter.simple_seed.test_seed import SeedConfigBase
7-
from dbt.tests.adapter.simple_seed.test_seed import (
8-
TestBasicSeedTests as BaseBasicSeedTests,
9-
)
7+
from dbt.tests.adapter.simple_seed.test_seed import TestBasicSeedTests as BaseBasicSeedTests
108
from dbt.tests.adapter.simple_seed.test_seed import (
119
TestSeedConfigFullRefreshOff as BaseSeedConfigFullRefreshOff,
1210
)
1311
from dbt.tests.adapter.simple_seed.test_seed import (
1412
TestSeedConfigFullRefreshOn as BaseSeedConfigFullRefreshOn,
1513
)
16-
from dbt.tests.adapter.simple_seed.test_seed import (
17-
TestSeedCustomSchema as BaseSeedCustomSchema,
18-
)
14+
from dbt.tests.adapter.simple_seed.test_seed import TestSeedCustomSchema as BaseSeedCustomSchema
1915
from dbt.tests.adapter.simple_seed.test_seed import TestSeedParsing as BaseSeedParsing
2016
from dbt.tests.adapter.simple_seed.test_seed import (
2117
TestSeedSpecificFormats as BaseSeedSpecificFormats,
@@ -29,11 +25,11 @@
2925
seeds__enabled_in_config_csv,
3026
)
3127
from dbt.tests.util import (
32-
get_connection,
33-
run_dbt,
3428
check_relations_equal,
3529
check_table_does_exist,
3630
check_table_does_not_exist,
31+
get_connection,
32+
run_dbt,
3733
)
3834

3935
from dbt.adapters.sqlserver import SQLServerAdapter

0 commit comments

Comments
 (0)