Skip to content

Commit

Permalink
Update MSSQL driver
Browse files Browse the repository at this point in the history
  • Loading branch information
AdamVyborny committed Sep 16, 2024
1 parent f8ab543 commit 0c151dd
Show file tree
Hide file tree
Showing 14 changed files with 15 additions and 16 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
&& curl https://packages.microsoft.com/config/debian/10/prod.list > /etc/apt/sources.list.d/mssql-release.list \
&& apt-get update \
&& ACCEPT_EULA=Y apt-get install -y --no-install-recommends \
msodbcsql17=17.7.1.1-1 \
mssql-tools=17.7.1.1-1 \
msodbcsql18 \
mssql-tools \
&& rm -r /var/lib/apt/lists/* \
&& sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen \
&& locale-gen \
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/bcp-retry/expected-stdout
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM unexistsTable' queryout 'in.c-main.sales.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Export process failed. Output: Starting copy... SQLState = S1000, NativeError = 0 Error = [Microsoft][ODBC Driver 17 for SQL Server]Unable to resolve column level collations SQLState = S0002, NativeError = 208 Error = [Microsoft][ODBC Driver 17 for SQL Server][SQL Server]Invalid object name 'unexistsTable'. BCP copy out failed . Error Output: .. Retrying... [1x]
Executing BCP command: bcp 'SELECT * FROM unexistsTable' queryout 'in.c-main.sales.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Expand Down
2 changes: 1 addition & 1 deletion tests/functional/clause-with-single-quote/expected-stdout
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "special" to "in.c-main.special".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT TOP 5 "usergender", "sku" FROM "sales" WHERE "usergender" LIKE '\''male'\''' queryout 'in.c-main.special.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "5" rows to "in.c-main.special".
2 changes: 1 addition & 1 deletion tests/functional/different-quoting/expected-stdout
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "special" to "in.c-main.special".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT usergender, [sku] FROM sales WHERE "usergender" LIKE '\''male'\''' queryout 'in.c-main.special.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "40" rows to "in.c-main.special".
2 changes: 1 addition & 1 deletion tests/functional/error-invalid-query/expected-stdout
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "special" to "in.c-main.special".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT SOMETHING INVALID FROM "dbo"."special"' queryout 'in.c-main.special.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exporting by "PDO" adapter.
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "special" to "in.c-main.special".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM "special";' queryout 'in.c-main.special.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exporting by "PDO" adapter.
Adapter "PDO" skipped: Disabled in configuration.
2 changes: 1 addition & 1 deletion tests/functional/pdo-fallback-disabled/expected-stdout
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "special" to "in.c-main.special".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM "special";' queryout 'in.c-main.special.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exporting by "PDO" adapter.
Adapter "PDO" skipped: Disabled in configuration.
2 changes: 1 addition & 1 deletion tests/functional/pdo-fallback/expected-stdout
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Connecting to DSN 'sqlsrv:Server=mssql,1433;Database=test'
Exporting "special" to "in.c-main.special".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM "special";' queryout 'in.c-main.special.csv' -S 'mssql,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exporting by "PDO" adapter.
Exported "7" rows to "in.c-main.special".
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Connecting to DSN 'sqlsrv:Server=mssql-ssl,1433;Database=test;Encrypt=true;Trust
Using SSL connection
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM sales' queryout 'in.c-main.sales.csv' -S 'mssql-ssl,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "100" rows to "in.c-main.sales".
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Connecting to DSN 'sqlsrv:Server=mssql-ssl,1433;Database=test;Encrypt=true;Trust
Using SSL connection
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM sales' queryout 'in.c-main.sales.csv' -S 'mssql-ssl,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "100" rows to "in.c-main.sales".
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ Connecting to DSN 'sqlsrv:Server=mssql-ssl-invalid-cn,1433;Database=test;Encrypt
Using SSL connection
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM sales' queryout 'in.c-main.sales.csv' -S 'mssql-ssl-invalid-cn,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "100" rows to "in.c-main.sales".

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ Connecting to DSN 'sqlsrv:Server=mssql-ssl-invalid-cn,1433;Database=test;Encrypt
Using SSL connection
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM sales' queryout 'in.c-main.sales.csv' -S 'mssql-ssl-invalid-cn,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "100" rows to "in.c-main.sales".
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Connecting to DSN 'sqlsrv:Server=mssql-ssl,1433;Database=test;Encrypt=true;Trust
Using SSL connection
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT * FROM sales' queryout 'in.c-main.sales.csv' -S 'mssql-ssl,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "100" rows to "in.c-main.sales".
2 changes: 1 addition & 1 deletion tests/functional/ssl-without-ca/expected-stdout
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Connecting to DSN 'sqlsrv:Server=mssql-ssl,1433;Database=test;Encrypt=true;Trust
Using SSL connection
Exporting "sales" to "in.c-main.sales".
Exporting by "BCP" adapter.
Found database server version: 15.%d.%d.%d
Found database server version: %d.%d.%d.%d
Executing BCP command: bcp 'SELECT TOP 3 * FROM sales' queryout 'in.c-main.sales.csv' -S 'mssql-ssl,1433' -U 'sa' -P ***** -d 'test' -q -k -b 50000 -m 1 -t "," -r "\n" -c
Exported "3" rows to "in.c-main.sales".

0 comments on commit 0c151dd

Please sign in to comment.