Skip to content

Commit 764c5e6

Browse files
authored
Merge pull request #696 from dbt-msft/chore/missings-for-v1.10.0
Improve environment setup and update dependencies for v1.10.0
2 parents d39afe5 + 51dfa5a commit 764c5e6

5 files changed

Lines changed: 52 additions & 23 deletions

File tree

.devcontainer/setup_env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ cp test.env.sample test.env
55
docker compose build
66
docker compose up -d
77

8-
# Install uv in the container user environment.
9-
pip install uv
8+
# Install uv in the container user environment only when needed.
9+
command -v uv >/dev/null 2>&1 || pip install uv
1010

1111
# Use a workspace-local virtualenv so package installs do not fail on user permissions.
1212
[ -d .venv ] || uv venv

.devcontainer/setup_odbc.sh

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,38 @@
1-
curl https://packages.microsoft.com/keys/microsoft.asc \
2-
| gpg --dearmor \
3-
| sudo tee /usr/share/keyrings/microsoft-prod.gpg >/dev/null
1+
package_installed() {
2+
dpkg-query -W -f='${db:Status-Abbrev}' "$1" 2>/dev/null | grep -q '^ii '
3+
}
44

5-
#Download appropriate package for the OS version
6-
#Choose only ONE of the following, corresponding to your OS version
5+
if ! package_installed msodbcsql18; then
6+
curl https://packages.microsoft.com/keys/microsoft.asc \
7+
| gpg --dearmor \
8+
| sudo tee /usr/share/keyrings/microsoft-prod.gpg >/dev/null
79

8-
#Debian 12
9-
curl https://packages.microsoft.com/config/debian/12/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
10+
# Download appropriate package for the OS version.
11+
# Choose only ONE of the following, corresponding to your OS version.
12+
13+
# Debian 12
14+
curl https://packages.microsoft.com/config/debian/12/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
15+
16+
sudo apt-get update
17+
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
18+
fi
1019

11-
sudo apt-get update
12-
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql18
1320
# optional: for bcp and sqlcmd
14-
sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18
15-
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
21+
if ! package_installed mssql-tools18; then
22+
sudo ACCEPT_EULA=Y apt-get install -y mssql-tools18
23+
fi
24+
25+
if ! grep -qF '/opt/mssql-tools18/bin' "$HOME/.bashrc"; then
26+
echo 'export PATH="$PATH:/opt/mssql-tools18/bin"' >> ~/.bashrc
27+
fi
1628
source ~/.bashrc
29+
1730
# optional: for unixODBC development headers
18-
sudo apt-get install -y unixodbc-dev
31+
if ! package_installed unixodbc-dev; then
32+
sudo apt-get install -y unixodbc-dev
33+
fi
34+
1935
# optional: kerberos library for debian-slim distributions
20-
sudo apt-get install -y libgssapi-krb5-2
36+
if ! package_installed libgssapi-krb5-2; then
37+
sudo apt-get install -y libgssapi-krb5-2
38+
fi

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
- Add opt-in native string type mappings via a behaviour flag.
1212
- Add default schema concatenation flag support and update the documentation.
1313
- Enable SQL Server limited-relation no-alias behavior by default.
14+
- Support catalog generation across multiple databases. [#603](https://github.com/dbt-msft/dbt-sqlserver/issues/603)
15+
- Fix view rematerialization when a view already exists, including preserving grants and avoiding unnecessary rebuilds. [#610](https://github.com/dbt-msft/dbt-sqlserver/issues/610)
1416

1517
#### Bugfixes
1618

@@ -20,6 +22,12 @@
2022
- Fix connection-string port handling regressions.
2123
- Fix `TABLOCK` interaction with contract-enforced inserts and `query_options`.
2224
- Fix `get_view_definition()` escaping for `]` characters.
25+
- Make the highest-frequency catalog queries sargable so they seek instead of scan. [#686](https://github.com/dbt-msft/dbt-sqlserver/issues/686)
26+
27+
#### Under the hood
28+
29+
- Drop Python 3.9 support; this release targets Python 3.10 and newer.
30+
- Adopt standard `pyproject.toml`/PEP 621 packaging metadata for source installs and downloads.
2331

2432
#### Migration note
2533

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ dependencies = [
3030
"dbt-core>=1.10.0,<2.0",
3131
"dbt-common>=1.22.0,<2.0",
3232
"dbt-adapters>=1.15.2,<2.0",
33+
"pyodbc>=5.2.0",
3334
]
3435
dynamic = ["version"]
3536

uv.lock

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)