From a7cd68290c29c78e2ecca35209c9b67101c34f47 Mon Sep 17 00:00:00 2001 From: Joe Bauser Date: Mon, 4 Sep 2017 15:14:19 -0400 Subject: [PATCH] Use tiny-tds 2.1.0.pre2 with defncopy wrapper --- .travis.yml | 2 +- appveyor.yml | 2 +- circle.yml | 2 +- lib/active_record/tasks/sqlserver_database_tasks.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 23688e751..db6c50639 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ services: - docker env: global: - - TINYTDS_VERSION=2.1.0.pre1 + - TINYTDS_VERSION=2.1.0.pre2 - ACTIVERECORD_UNITTEST_HOST=localhost - ACTIVERECORD_UNITTEST_DATASERVER=localhost rvm: diff --git a/appveyor.yml b/appveyor.yml index cb6fb53eb..9024e320c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ init: - SET PATH=C:\Ruby%ruby_version%\bin;%PATH% - SET PATH=C:\MinGW\msys\1.0\bin;%PATH% - SET RAKEOPT=-rdevkit - - SET TINYTDS_VERSION=2.1.0.pre1 + - SET TINYTDS_VERSION=2.1.0.pre2 clone_depth: 5 skip_tags: true matrix: diff --git a/circle.yml b/circle.yml index 26c470f11..b1b4aacdf 100644 --- a/circle.yml +++ b/circle.yml @@ -6,7 +6,7 @@ general: machine: environment: PATH: /opt/local/bin:${PATH} - TINYTDS_VERSION: 2.1.0.pre1 + TINYTDS_VERSION: 2.1.0.pre2 ACTIVERECORD_UNITTEST_HOST: localhost ACTIVERECORD_UNITTEST_DATASERVER: localhost services: diff --git a/lib/active_record/tasks/sqlserver_database_tasks.rb b/lib/active_record/tasks/sqlserver_database_tasks.rb index 9bf106a7c..0c62d58e4 100644 --- a/lib/active_record/tasks/sqlserver_database_tasks.rb +++ b/lib/active_record/tasks/sqlserver_database_tasks.rb @@ -50,7 +50,7 @@ def purge def structure_dump(filename, extra_flags) command = [ - "defncopy", + "defncopy-ttds", "-S #{Shellwords.escape(configuration['host'])}", "-D #{Shellwords.escape(configuration['database'])}", "-U #{Shellwords.escape(configuration['username'])}",