activerecord-sqlserver-adapter 5.2.0.rc1 → 5.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 377130fc57eb80986c8ba867952e53d05bd45716
-  data.tar.gz: 375ddc75d6a352aec3546a0ceba47e92aa08c048
+SHA256:
+  metadata.gz: 86082ad4b36f21839ed6bde7e9400d53497d03f9fa20e7d05e88e5f44b908044
+  data.tar.gz: 5ff7193466b8db1c2bd86983be80b8ca0e95a5b59359c9d8baccb20a633950cc
 SHA512:
-  metadata.gz: c0d096eb7dbc408c115dc1f694455f67923caca5e3921d23641afc137ac4852d7fdd033d8b4ddc641ad2187b1bc0b83229fe8e81da20fff37b1c42f1825e9239
-  data.tar.gz: d5170789fb99e9aea3642c22c9c3e39a0ccb1ee78b0a3015a046d2dd5a179736a61f8483dd878d06c19535f0e32e4a15766ecc1474f2b140b4cb3b362c48d7d8
+  metadata.gz: 353e197ded79e31d9f631c7b53a74e80c423de40da152dd0f65bfbf9a19b7427dd9c5e9106db42054e161a82a618a2c17034aa0a3990a333fdfec0fc7e4a8bdd
+  data.tar.gz: 1f4baeebc22334781cf45314bf98f22922edde9b5017f4c6bd1231dd06741f9769dc0497a7906eed696bf29dda1561789f1222b28d747302c3e39ecc8096a12b

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v5.2.0.rc2
+
+#### Fixed
+
+- #681 change_column_null should not clear other column attributes. Fixes #582.
+- #684 Fix explain with array conditions. Fixes #673.
+
 ## v5.2.0.rc1
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-5.2.0.rc1
+5.2.0.rc2

data/lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb

@@ -5,12 +5,11 @@ module ActiveRecord
         module Explain
 
           SQLSERVER_STATEMENT_PREFIX = 'EXEC sp_executesql '.freeze
-          SQLSERVER_PARAM_MATCHER = /@\d+ = (.*)/
-          SQLSERVER_NATIONAL_STRING_MATCHER = /N'(.*)'/m
+          SQLSERVER_STATEMENT_REGEXP = /N'(.+)', N'(.+)', (.+)/
 
           def exec_explain(queries)
             unprepared_queries = queries.map do |(sql, binds)|
-              [unprepare_sqlserver_statement(sql), binds]
+              [unprepare_sqlserver_statement(sql, binds), binds]
             end
             super(unprepared_queries)
           end
@@ -19,22 +18,19 @@ module ActiveRecord
 
           # This is somewhat hacky, but it should reliably reformat our prepared sql statment
           # which uses sp_executesql to just the first argument, then unquote it. Likewise our
-          # `sp_executesql` method should substitude the @n args withe the quoted values.
-          def unprepare_sqlserver_statement(sql)
-            if sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
-              executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
-              args = executesql.split(', ')
-              unprepared_sql = args.shift.strip.match(SQLSERVER_NATIONAL_STRING_MATCHER)[1]
-              unprepared_sql = Utils.unquote_string(unprepared_sql)
-              args = args.from(args.length / 2)
-              args.each_with_index do |arg, index|
-                value = arg.match(SQLSERVER_PARAM_MATCHER)[1]
-                unprepared_sql.sub! "@#{index}", value
-              end
-              unprepared_sql
-            else
-              sql
+          # `sp_executesql` method should substitude the @n args with the quoted values.
+          def unprepare_sqlserver_statement(sql, binds)
+            return sql unless sql.starts_with?(SQLSERVER_STATEMENT_PREFIX)
+
+            executesql = sql.from(SQLSERVER_STATEMENT_PREFIX.length)
+            executesql = executesql.match(SQLSERVER_STATEMENT_REGEXP).to_a[1]
+
+            binds.each_with_index do |bind, index|
+              value = connection.quote(bind)
+              executesql = executesql.sub("@#{index}", value)
             end
+
+            executesql
           end
 
         end

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

@@ -258,7 +258,7 @@ module ActiveRecord
         def change_column_null(table_name, column_name, allow_null, default = nil)
           table_id = SQLServer::Utils.extract_identifiers(table_name)
           column_id = SQLServer::Utils.extract_identifiers(column_name)
-          column = detect_column_for! table_name, column_name
+          column = column_for(table_name, column_name)
           if !allow_null.nil? && allow_null == false && !default.nil?
             do_execute("UPDATE #{table_id} SET #{column_id}=#{quote(default)} WHERE #{column_id} IS NULL")
           end
@@ -492,13 +492,6 @@ module ActiveRecord
           "DF_#{table_name}_#{column_name}"
         end
 
-        def detect_column_for!(table_name, column_name)
-          unless column = schema_cache.columns(table_name).find { |c| c.name == column_name.to_s }
-            raise ActiveRecordError, "No such column: #{table_name}.#{column_name}"
-          end
-          column
-        end
-
         def lowercase_schema_reflection_sql(node)
           lowercase_schema_reflection ? "LOWER(#{node})" : node
         end

data/test/cases/change_column_null_test_sqlserver.rb

@@ -0,0 +1,42 @@
+require 'cases/helper_sqlserver'
+require 'migrations/create_clients_and_change_column_null'
+
+class ChangeColumnNullTestSqlServer < ActiveRecord::TestCase
+  before do
+    @old_verbose = ActiveRecord::Migration.verbose
+    ActiveRecord::Migration.verbose = false
+    CreateClientsAndChangeColumnNull.new.up
+  end
+
+  after do
+    CreateClientsAndChangeColumnNull.new.down
+    ActiveRecord::Migration.verbose = @old_verbose
+  end
+
+  def find_column(table, name)
+    table.find { |column| column.name == name }
+  end
+
+  let(:clients_table) { connection.columns('clients') }
+  let(:name_column) { find_column(clients_table, 'name') }
+  let(:code_column) { find_column(clients_table, 'code') }
+  let(:value_column) { find_column(clients_table, 'value') }
+
+  describe '#change_column_null' do
+    it 'does not change the column limit' do
+      name_column.limit.must_equal 15
+    end
+
+    it 'does not change the column default' do
+      code_column.default.must_equal 'n/a'
+    end
+
+    it 'does not change the column precision' do
+      value_column.precision.must_equal 32
+    end
+
+    it 'does not change the column scale' do
+      value_column.scale.must_equal 8
+    end
+  end
+end

data/test/cases/showplan_test_sqlserver.rb

@@ -26,6 +26,18 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
       plan.must_include "Clustered Index Scan", 'make sure we do not showplan the sp_executesql'
     end
 
+    it 'from array condition using index' do
+      plan = Car.where(id: [1, 2]).explain
+      plan.must_include " SELECT [cars].* FROM [cars] WHERE [cars].[id] IN (1, 2)"
+      plan.must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
+    end
+
+    it 'from array condition' do
+      plan = Car.where(name: ['honda', 'zyke']).explain
+      plan.must_include " SELECT [cars].* FROM [cars] WHERE [cars].[name] IN (N'honda', N'zyke')"
+      plan.must_include "Clustered Index Scan", 'make sure we do not showplan the sp_executesql'
+    end
+
   end
 
   describe 'With SHOWPLAN_TEXT option' do

data/test/migrations/create_clients_and_change_column_null.rb

@@ -0,0 +1,23 @@
+class CreateClientsAndChangeColumnNull < ActiveRecord::Migration[5.2]
+  def up
+    create_table :clients do |t|
+      t.string :name
+      t.string :code
+      t.decimal :value
+
+      t.timestamps
+    end
+
+    change_column :clients, :name, :string, limit: 15
+    change_column :clients, :code, :string, default: 'n/a'
+    change_column :clients, :value, :decimal, precision: 32, scale: 8
+
+    change_column_null :clients, :name, false
+    change_column_null :clients, :code, false
+    change_column_null :clients, :value, false
+  end
+
+  def down
+    drop_table :clients
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc1
+  version: 5.2.0.rc2
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -138,6 +138,7 @@ files:
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
 - test/cases/adapter_test_sqlserver.rb
+- test/cases/change_column_null_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
@@ -163,6 +164,7 @@ files:
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
+- test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
 - test/models/sqlserver/booking.rb
 - test/models/sqlserver/customers_view.rb
@@ -220,8 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
@@ -232,6 +233,7 @@ test_files:
 - test/bin/install-openssl.sh
 - test/bin/setup.sh
 - test/cases/adapter_test_sqlserver.rb
+- test/cases/change_column_null_test_sqlserver.rb
 - test/cases/coerced_tests.rb
 - test/cases/column_test_sqlserver.rb
 - test/cases/connection_test_sqlserver.rb
@@ -257,6 +259,7 @@ test_files:
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
+- test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
 - test/models/sqlserver/booking.rb
 - test/models/sqlserver/customers_view.rb