activerecord-sqlserver-adapter 5.0.1 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b31a0ea33247aafc00f6d836c4de3a1c76dca176
-  data.tar.gz: a66c59a131675c4cf381717e00e5211c4263fe7b
+  metadata.gz: 7b2b6f7f8589a69b587c63d0de5713b527e2389f
+  data.tar.gz: 738c33f3937b47b7e87b54bf6436fcc81d3dbd4f
 SHA512:
-  metadata.gz: b6a8fc99daef2bbd923eb5aa7ccee8f1dcdab3dcd4b3edbda58242201ae93a4cd5bf453996a568a8af847c0f72ec230df0b06185bdc70eeb4981c184656e7bb7
-  data.tar.gz: 3a68c7e45dd613fc89901d61cf1ab82cd3cc02cda3f93d2f37f95ff52d3f9ea8aed0d2dad61faf552996c5355fc53a457b020f55b277f4a0f2e096eb55a83701
+  metadata.gz: 65a7995a536eb3eedf3a771aff7c0645538189f131add85db6c585e43c03547ed64158009e53183310f05c8c9a5c40e8158baa79758f6bfcb0e5d7b680c472c5
+  data.tar.gz: 69eae26ecb4a8ccb7cc61e8b689e579ecae2046692de4fefe9978f2e36c4e1731231aec33b580545a521245041f3af9b9f833ec2ee9160874acbe723e1421019

data/.travis.yml

@@ -10,6 +10,7 @@ env:
 rvm:
   - 2.2.5
   - 2.3.1
+  - 2.4.0
 before_install:
   - export PATH=/opt/local/bin:$PATH
   - docker info

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+## v5.0.3
+
+#### Changed
+
+* Reduce view information reflection to per table vs. column. Fixes #552
+* The `user_options` parsing. Works for hash/array. Fixes #535
+* Pass the `:contained` option to TinyTDS. Fixes #527
+
+
+## v5.0.2
+
+#### Fixed
+
+* Filter table constraints with matching table schema to column. Fixes #478
+
+
 ## v5.0.1
 
 #### Changed

data/README.md

@@ -5,6 +5,7 @@
 * [![CircleCI](https://circleci.com/gh/rails-sqlserver/activerecord-sqlserver-adapter/tree/master.svg?style=svg)](https://circleci.com/gh/rails-sqlserver/activerecord-sqlserver-adapter/tree/master) - CircleCI
 * [![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) - 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
 
 

data/VERSION

@@ -1 +1 @@
-5.0.1
+5.0.3

data/circle.yml

@@ -20,6 +20,7 @@ dependencies:
     - tsql -C
     - rvm-exec 2.2.5 bundle install
     - rvm-exec 2.3.1 bundle install
+    - rvm-exec 2.4.0 bundle install
 
 database:
   override:
@@ -32,3 +33,4 @@ test:
   override:
     - rvm-exec 2.2.5 bundle exec rake test
     - rvm-exec 2.3.1 bundle exec rake test
+    - rvm-exec 2.4.0 bundle exec rake test

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

@@ -132,7 +132,9 @@ module ActiveRecord
 
         def user_options
           return {} if sqlserver_azure?
-          select_rows('dbcc useroptions', 'SCHEMA').reduce(HashWithIndifferentAccess.new) do |values, row|
+          rows = select_rows('dbcc useroptions', 'SCHEMA')
+          rows = rows.first if rows.size == 2 && rows.last.empty?
+          rows.reduce(HashWithIndifferentAccess.new) do |values, row|
             if row.instance_of? Hash
               set_option = row.values[0].gsub(/\s+/, '_')
               user_value = row.values[1]

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

@@ -326,6 +326,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
@@ -469,20 +470,23 @@ module ActiveRecord
         end
 
         def view_information(table_name)
-          identifier = SQLServer::Utils.extract_identifiers(table_name)
-          view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{identifier.object}'", 'SCHEMA'
-          if view_info
-            view_info = view_info.with_indifferent_access
-            if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
-              view_info[:VIEW_DEFINITION] = begin
-                select_values("EXEC sp_helptext #{identifier.object_quoted}", 'SCHEMA').join
-              rescue
-                warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
-                nil
+          @view_information ||= {}
+          @view_information[table_name] ||= begin
+            identifier = SQLServer::Utils.extract_identifiers(table_name)
+            view_info = select_one "SELECT * FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_NAME = '#{identifier.object}'", 'SCHEMA'
+            if view_info
+              view_info = view_info.with_indifferent_access
+              if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
+                view_info[:VIEW_DEFINITION] = begin
+                  select_values("EXEC sp_helptext #{identifier.object_quoted}", 'SCHEMA').join
+                rescue
+                  warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
+                  nil
+                end
               end
             end
+            view_info
           end
-          view_info
         end
 
         def views_real_column_name(table_name, column_name)

data/lib/active_record/connection_adapters/sqlserver_adapter.rb

@@ -176,11 +176,12 @@ module ActiveRecord
           @connection.close rescue nil
         end
         @connection = nil
+        @spid = nil
+        @collation = nil
       end
 
       def clear_cache!
-        @spid = nil
-        @collation = nil
+        @view_information = nil
         super
       end
 
@@ -362,7 +363,8 @@ module ActiveRecord
           login_timeout: config_login_timeout(config),
           timeout: config_timeout(config),
           encoding:  config_encoding(config),
-          azure: config[:azure]
+          azure: config[:azure],
+          contained: config[:contained]
         ).tap do |client|
           if config[:azure]
             client.execute('SET ANSI_NULLS ON').do

data/test/bin/setup.sh

@@ -3,15 +3,17 @@
 set -x
 set -e
 
-docker pull metaskills/mssql-server-linux-rails
+tag=1.2
 
-container=$(docker ps -a -q --filter ancestor=metaskills/mssql-server-linux-rails)
+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 && sleep 10
+  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)
+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

@@ -165,4 +165,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: 5.0.1
+  version: 5.0.3
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-17 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord