activerecord-sqlserver-adapter 4.2.15 → 4.2.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d48925cc69817fb38f75ba9ce678d5df931b7d7
-  data.tar.gz: f0cd00edff4e8b9fb009b239368c8cb799e48e66
+  metadata.gz: 7c7985b6dcbd1c96d62b6c252bd260826c5689fa
+  data.tar.gz: 3708a1600a2c515ff4f7605c45079728c10fe254
 SHA512:
-  metadata.gz: 43b840b4991b0584ab46219d2d427adbd28b3c67586726b8367ac124927b3fb05d99ba4034706c4486df66a00dffdd731fc3b1d9cad36be35b0da747e912a1c6
-  data.tar.gz: 09c590c4c7e253e493c130addfee719741b308f453274ecfce1f3da4a4ecc770cf91e18e7600325bf6d89c273e6c6e47070be433502e71ea25d5b92d015da4c6
+  metadata.gz: edd7abf4c1cf08d0caf66bae13b7cce3bb715b273572d08e60e8527f671b22c7a2b8ae04164a17b4855960eaf5931c701e01ff35f96aa780828ac68f2aaac843
+  data.tar.gz: e744b5c9cb0969436ae7dbb122f6c9de5ee955b4ca776c7696bc1ecfa6b21addbc604f6f360d47ba1790ee77d9bd2578502d2884380d0a71a572eb041d2159a3

data/.travis.yml

@@ -0,0 +1,27 @@
+sudo: required
+cache: bundler
+services:
+  - docker
+env:
+  global:
+    - TINYTDS_VERSION=1.1.0
+    - ACTIVERECORD_UNITTEST_HOST=localhost
+    - ACTIVERECORD_UNITTEST_DATASERVER=localhost
+rvm:
+  - 2.2.5
+  - 2.3.1
+before_install:
+  - export PATH=/opt/local/bin:$PATH
+  - docker info
+  - sudo ./test/bin/setup.sh
+  - sudo ./test/bin/install-openssl.sh
+  - openssl version
+  - sudo ./test/bin/install-freetds.sh
+  - tsql -C
+install:
+  - export PATH=/opt/local/bin:$PATH
+  - gem install bundler
+  - bundle --version
+  - bundle install
+script:
+  - bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## v4.2.16
+
+#### Fixed
+
+* Overwrite `_type_cast` method for char data. Fixes #491 #494
+* Char type data compared against it's string value. Fixes #487 #488
+* Filter table constraints with matching table schema to column. Fixes #478
+
+
 ## v4.2.15
 
 #### Fixed

data/README.md

@@ -1,7 +1,12 @@
 
 # ActiveRecord SQL Server Adapter. For SQL Server 2012 And Higher.
 
-[![Build status](https://ci.appveyor.com/api/projects/status/mtgbx8f57vr7k2qa/branch/master?svg=true)](https://ci.appveyor.com/project/rails-sqlserver/activerecord-sqlserver-adapter/branch/master) [![Gem Version](http://img.shields.io/gem/v/activerecord-sqlserver-adapter.svg?style=flat)](https://rubygems.org/gems/activerecord-sqlserver-adapter) [![Gitter chat](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter)
+* [![TravisCI](https://travis-ci.org/rails-sqlserver/activerecord-sqlserver-adapter.svg?branch=4-2-stable)](https://travis-ci.org/rails-sqlserver/activerecord-sqlserver-adapter) - TravisCI
+* [![CircleCI](https://circleci.com/gh/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable.svg?style=svg)](https://circleci.com/gh/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable) - CircleCI
+* [![Build Status](https://ci.appveyor.com/api/projects/status/mtgbx8f57vr7k2qa/branch/4-2-stable?svg=true)](https://ci.appveyor.com/project/rails-sqlserver/activerecord-sqlserver-adapter/branch/4-2-stable) - Appveyor
+* [![Gem Version](http://img.shields.io/gem/v/activerecord-sqlserver-adapter.svg)](https://rubygems.org/gems/activerecord-sqlserver-adapter) - Gem Version
+* [![Dependency Status](https://dependencyci.com/github/rails-sqlserver/activerecord-sqlserver-adapter/badge)](https://dependencyci.com/github/rails-sqlserver/activerecord-sqlserver-adapter) - Dependency Status
+* [![Gitter chat](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/rails-sqlserver/activerecord-sqlserver-adapter) - Community
 
 ![kantishna-wide](https://cloud.githubusercontent.com/assets/2381/5895051/aa6a57e0-a4e1-11e4-95b9-23627af5876a.jpg)
 

data/VERSION

@@ -1 +1 @@
-4.2.15
+4.2.16

data/appveyor.yml

@@ -2,8 +2,7 @@ init:
   - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
   - SET PATH=C:\MinGW\msys\1.0\bin;%PATH%
   - SET RAKEOPT=-rdevkit
-  - SET TESTOPTS='-v'
-  - SET TINYTDS_VERSION=1.0.4
+  - SET TINYTDS_VERSION=1.1.0
 clone_depth: 5
 skip_tags: true
 matrix:
@@ -12,7 +11,9 @@ install:
   - ps: Update-AppveyorBuild -Version "$(Get-Content $env:appveyor_build_folder\VERSION).$env:appveyor_build_number"
   - ruby --version
   - gem --version
-  - bundle install --without odbc guard
+  - bundle install
+  - gem uninstall bcrypt
+  - gem install bcrypt --platform=ruby
 build: off
 test_script:
   - powershell -File "%APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.ps1"
@@ -26,14 +27,13 @@ test_script:
   - timeout /t 4 /nobreak > NUL
   - sqlcmd -S ".\SQL2012SP1" -U sa -P Password12! -i %APPVEYOR_BUILD_FOLDER%\test\appveyor\dbsetup.sql
   - bundle exec rake test ACTIVERECORD_UNITTEST_DATASERVER="localhost\SQL2012SP1"
-  - timeout /t 4 /nobreak > NUL
-  - bundle exec rake test ACTIVERECORD_UNITTEST_HOST=%CI_AZURE_HOST% ACTIVERECORD_UNITTEST_PASS=%CI_AZURE_PASS% ACTIVERECORD_UNITTEST_AZURE=1
 environment:
   CI_AZURE_HOST:
     secure: VChrioaIWkf9iuuaSs4cryiA4honrADgZqNC0++begg=
   CI_AZURE_PASS:
     secure: cSQp8sk4urJYvq0utpsK+r7J+snJ2wpcdp8RdXJfB+w=
   matrix:
-    - ruby_version: "200"
-    - ruby_version: "22"
+    - ruby_version: "23-x64"
+    - ruby_version: "23"
     - ruby_version: "22-x64"
+    - ruby_version: "22"

data/circle.yml

@@ -0,0 +1,34 @@
+general:
+  branches:
+    ignore:
+      - /dev.*/
+
+machine:
+  environment:
+    PATH: /opt/local/bin:${PATH}
+    TINYTDS_VERSION: 1.1.0
+    ACTIVERECORD_UNITTEST_HOST: localhost
+    ACTIVERECORD_UNITTEST_DATASERVER: localhost
+  services:
+    - docker
+
+dependencies:
+  override:
+    - sudo ./test/bin/install-openssl.sh
+    - openssl version
+    - sudo ./test/bin/install-freetds.sh
+    - tsql -C
+    - rvm-exec 2.2.5 bundle install
+    - rvm-exec 2.3.1 bundle install
+
+database:
+  override:
+    - echo "Hello"
+  post:
+    - docker info
+    - ./test/bin/setup.sh
+
+test:
+  override:
+    - rvm-exec 2.2.5 bundle exec rake test
+    - rvm-exec 2.3.1 bundle exec rake test

data/lib/active_record/connection_adapters/sqlserver/quoting.rb

@@ -63,6 +63,15 @@ module ActiveRecord
           end
         end
 
+        def _type_cast(value)
+          case value
+          when ActiveRecord::Type::SQLServer::Char::Data
+            value.to_s
+          else
+            super
+          end
+        end
+
       end
     end
   end

data/lib/active_record/connection_adapters/sqlserver/schema_statements.rb

@@ -264,6 +264,7 @@ module ActiveRecord
             FROM #{database}.INFORMATION_SCHEMA.COLUMNS columns
             LEFT OUTER JOIN #{database}.INFORMATION_SCHEMA.TABLE_CONSTRAINTS AS TC
               ON TC.TABLE_NAME = columns.TABLE_NAME
+              AND TC.TABLE_SCHEMA = columns.TABLE_SCHEMA
               AND TC.CONSTRAINT_TYPE = N'PRIMARY KEY'
             LEFT OUTER JOIN #{database}.INFORMATION_SCHEMA.KEY_COLUMN_USAGE AS KCU
               ON KCU.COLUMN_NAME = columns.COLUMN_NAME

data/lib/active_record/connection_adapters/sqlserver/type/char.rb

@@ -29,6 +29,11 @@ module ActiveRecord
             end
             alias_method :to_str, :to_s
 
+            def ==(other)
+              self.to_s == other.to_s
+            end
+            alias_method :eql?, :==
+
           end
 
         end

data/test/bin/install-freetds.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+FREETDS_VERSION=1.00.21
+
+wget ftp://ftp.freetds.org/pub/freetds/stable/freetds-$FREETDS_VERSION.tar.gz
+tar -xzf freetds-$FREETDS_VERSION.tar.gz
+cd freetds-$FREETDS_VERSION
+./configure --prefix=/opt/local \
+            --with-openssl=/opt/local \
+            --with-tdsver=7.3
+make
+make install
+cd ..
+rm -rf freetds-$FREETDS_VERSION
+rm freetds-$FREETDS_VERSION.tar.gz

data/test/bin/install-openssl.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+OPENSSL_VERSION=1.0.2j
+
+wget https://www.openssl.org/source/openssl-$OPENSSL_VERSION.tar.gz
+tar -xzf openssl-$OPENSSL_VERSION.tar.gz
+cd openssl-$OPENSSL_VERSION
+./config --prefix=/opt/local
+make
+make install
+cd ..
+rm -rf openssl-$OPENSSL_VERSION
+rm openssl-$OPENSSL_VERSION.tar.gz

data/test/bin/setup.sh

@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -x
+set -e
+
+tag=1.2
+
+docker pull metaskills/mssql-server-linux-rails:$tag
+
+container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-rails:$tag)
+if [[ -z $container ]]; then
+  docker run -p 1433:1433 -d metaskills/mssql-server-linux-rails:$tag && sleep 10
+  exit
+fi
+
+container=$(docker ps -q --filter ancestor=metaskills/mssql-server-linux-rails:$tag)
+if [[ -z $container ]]; then
+  docker start $container && sleep 10
+fi

data/test/cases/specific_schema_test_sqlserver.rb

@@ -164,4 +164,12 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     db_uuid.must_match(acceptable_uuid)
   end
 
+  # with similar table definition in two schemas
+
+  it 'returns the correct primary columns' do
+    connection = ActiveRecord::Base.connection
+    assert_equal 'field_1', connection.columns('test.sst_schema_test_mulitple_schema').detect(&:is_primary?).name
+    assert_equal 'field_2', connection.columns('test2.sst_schema_test_mulitple_schema').detect(&:is_primary?).name
+  end
+
 end

data/test/schema/sqlserver_specific_schema.rb

@@ -204,4 +204,20 @@ ActiveRecord::Schema.define do
     )
   NATURALPKTABLESQLINOTHERSCHEMA
 
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_schema_test_mulitple_schema' and TABLE_SCHEMA = 'test') DROP TABLE test.sst_schema_test_mulitple_schema"
+  execute <<-SCHEMATESTMULTIPLESCHEMA
+    CREATE TABLE test.sst_schema_test_mulitple_schema(
+      field_1 int NOT NULL PRIMARY KEY,
+      field_2 int,
+    )
+  SCHEMATESTMULTIPLESCHEMA
+  execute "IF NOT EXISTS(SELECT * FROM sys.schemas WHERE name = 'test2') EXEC sp_executesql N'CREATE SCHEMA test2'"
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_schema_test_mulitple_schema' and TABLE_SCHEMA = 'test2') DROP TABLE test2.sst_schema_test_mulitple_schema"
+  execute <<-SCHEMATESTMULTIPLESCHEMA
+    CREATE TABLE test2.sst_schema_test_mulitple_schema(
+      field_1 int,
+      field_2 int NOT NULL PRIMARY KEY,
+    )
+  SCHEMATESTMULTIPLESCHEMA
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.15
+  version: 4.2.16
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,6 +39,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -50,6 +51,7 @@ files:
 - VERSION
 - activerecord-sqlserver-adapter.gemspec
 - appveyor.yml
+- circle.yml
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
@@ -112,6 +114,10 @@ files:
 - lib/arel_sqlserver.rb
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
+- test/bin/.keep
+- test/bin/install-freetds.sh
+- test/bin/install-openssl.sh
+- test/bin/setup.sh
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
@@ -188,13 +194,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files:
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
+- test/bin/.keep
+- test/bin/install-freetds.sh
+- test/bin/install-openssl.sh
+- test/bin/setup.sh
 - test/cases/adapter_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
@@ -251,4 +261,3 @@ test_files:
 - test/support/paths_sqlserver.rb
 - test/support/rake_helpers.rb
 - test/support/sql_counter_sqlserver.rb
-has_rdoc: