From 450a870c7e6f2119d42271b5fb4ad00f96e3469e Mon Sep 17 00:00:00 2001 From: Aidan Haran Date: Wed, 5 Jun 2024 19:30:54 +0100 Subject: [PATCH] Update Freetds to match CI --- .devcontainer/Dockerfile | 6 +++--- test/cases/rake_test_sqlserver.rb | 12 ++++++++---- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 8c67b380d..116b439f1 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -6,9 +6,9 @@ FROM mcr.microsoft.com/devcontainers/ruby:${VARIANT} # TinyTDS RUN apt-get -y install libc6-dev \ - && wget http://www.freetds.org/files/stable/freetds-1.1.32.tar.gz \ - && tar -xzf freetds-1.1.32.tar.gz \ - && cd freetds-1.1.32 \ + && wget http://www.freetds.org/files/stable/freetds-1.4.14.tar.gz \ + && tar -xzf freetds-1.4.14.tar.gz \ + && cd freetds-1.4.14 \ && ./configure --prefix=/usr/local --with-tdsver=7.3 \ && make \ && make install diff --git a/test/cases/rake_test_sqlserver.rb b/test/cases/rake_test_sqlserver.rb index 145bc7119..ea1074d76 100644 --- a/test/cases/rake_test_sqlserver.rb +++ b/test/cases/rake_test_sqlserver.rb @@ -138,18 +138,22 @@ class SQLServerRakeStructureDumpLoadTest < SQLServerRakeTest it "dumps structure and accounts for defncopy oddities" do skip "debug defncopy on windows later" if host_windows? + quietly { db_tasks.structure_dump configuration, filename } + _(filedata).wont_match %r{\AUSE.*\z} _(filedata).wont_match %r{\AGO.*\z} - _(filedata).must_match %r{email\s+nvarchar\(4000\)} - _(filedata).must_match %r{background1\s+nvarchar\(max\)} - _(filedata).must_match %r{background2\s+text\s+} + _(filedata).must_match %r{\[email\]\s+nvarchar\(4000\)} + _(filedata).must_match %r{\[background1\]\s+nvarchar\(max\)} + _(filedata).must_match %r{\[background2\]\s+text\s+} end it "can load dumped structure" do skip "debug defncopy on windows later" if host_windows? + quietly { db_tasks.structure_dump configuration, filename } - _(filedata).must_match %r{CREATE TABLE dbo\.users} + + _(filedata).must_match %r{CREATE TABLE \[dbo\]\.\[users\]} db_tasks.purge(configuration) _(connection.tables).wont_include "users" db_tasks.load_schema db_config, :sql, filename