activerecord-sqlserver-adapter 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aee2e7463020662106644d64594b1cd857559fe
-  data.tar.gz: 193864928eb15fb868cdbd49bc1754ae7f915d6a
+  metadata.gz: dc44e3b9473a3d9c9070b2ca07d12086a2671a6b
+  data.tar.gz: d0c038b489868dacf097104d08dd9e0e23d68f56
 SHA512:
-  metadata.gz: f2f572dbcb8931c53cff675a3aaf45f4da18b3c61eeeb36138a726a8e40f2d1e40497ed524bf5cc60b94640070583d1fb2a706ec7b6e5cb19877e7208367ca0e
-  data.tar.gz: 597b940c01ecba50345383606c622cfa6a60ae8ac37a376b034c7cf6a1d16603533fe64a2caa0e5d2b2349ea65978c2283a058371e95fe50bee10a4ef0cef247
+  metadata.gz: e744bbfbe647d84ea95e787759d46a5df02b1357b6212d720cdb5c52aaae0edcefc6e15c7f76da19c0014cbda645702b161e786ee17d7be995aae08eb0bc0a87
+  data.tar.gz: b65102d0b2f4deee4732d3718e82c8763d8e729dd40ac6f05ee8c8ed7b1fd8a740f9da02f03978f7171ce289b0fd3546a3c0c51537bee5010ff6a71e225b7f58

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 
+## v4.2.1
+
+#### Fixed
+
+* Guard against empty view definitions when `sb_helptext` fails silently. Fixes #337.
+* Proper table/column escaping in the `change_column_null` method. Fixes #355.
+* Use `send :include` for modules for 1.9 compatibility. Fixes #383.
+
+
 ## v4.2.0
 
 #### Added

data/README.md

@@ -10,12 +10,6 @@
 
 The SQL Server adapter for ActiveRecord. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter. We follow a rational versioning policy that tracks ActiveRecord. That means that our 4.2.x version of the adapter is only for the latest 4.2 version of Rails. We also have stable branches for each major/minor release of ActiveRecord.
 
-The 4.2 gem is in pre-release till we get a few more [bugs](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/milestones) worked out. Bundle to the pre version or this repos master directory.
-
-```ruby
-gem 'activerecord-sqlserver-adapter', '~> 4.2.0.pre'
-```
-
 
 #### Testing Rake Tasks Support
 

data/RUNNING_UNIT_TESTS.md

@@ -17,6 +17,16 @@ Default testing uses DBLIB with TinyTDS.
 * $ bundle install
 * $ bundle exec rake test ACTIVERECORD_UNITTEST_HOST='my.db.net'
 
+Focusing tests. Use the `ONLY_` env vars to run either ours or the ActiveRecord cases. Use the `TEST_FILES` env variants to focus on specific test(s), use commas for multiple cases. Note, you have to use different env vars to focus only on ours or a core ActiveRecord case. There may be failures when focusing on an ActiveRecord case since our coereced test files is not loaded in this scenerio.
+
+```
+$ bundle exec rake test ONLY_SQLSERVER=1
+$ bundle exec rake test ONLY_ACTIVERECORD=1
+
+$ bundle exec rake test TEST_FILES="test/cases/adapter_test_sqlserver.rb"
+$ bundle exec rake test TEST_FILES_AR="test/cases/finder_test.rb"
+```
+
 
 ## Creating the test databases
 

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

@@ -166,11 +166,13 @@ module ActiveRecord
         end
 
         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
           if !allow_null.nil? && allow_null == false && !default.nil?
-            do_execute("UPDATE #{quote_table_name(table_name)} SET #{quote_column_name(column_name)}=#{quote(default)} WHERE #{quote_column_name(column_name)} IS NULL")
+            do_execute("UPDATE #{table_id} SET #{column_id}=#{quote(default)} WHERE #{column_id} IS NULL")
           end
-          sql = "ALTER TABLE #{table_name} ALTER COLUMN #{quote_column_name(column_name)} #{type_to_sql column.type, column.limit, column.precision, column.scale}"
+          sql = "ALTER TABLE #{table_id} ALTER COLUMN #{column_id} #{type_to_sql column.type, column.limit, column.precision, column.scale}"
           sql << ' NOT NULL' if !allow_null.nil? && allow_null == false
           do_execute sql
         end
@@ -415,6 +417,7 @@ module ActiveRecord
 
         def views_real_column_name(table_name, column_name)
           view_definition = schema_cache.view_information(table_name)[:VIEW_DEFINITION]
+          return column_name unless view_definition
           match_data = view_definition.match(/([\w-]*)\s+as\s+#{column_name}/im)
           match_data ? match_data[1] : column_name
         end

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

@@ -19,7 +19,7 @@ module ActiveRecord
 
     end
 
-    Transaction.include SQLServerTransaction
+    Transaction.send :include, SQLServerTransaction
 
     module SQLServerRealTransaction
 
@@ -46,7 +46,7 @@ module ActiveRecord
 
     end
 
-    RealTransaction.include SQLServerRealTransaction
+    RealTransaction.send :include, SQLServerRealTransaction
 
   end
 end

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

@@ -3,7 +3,7 @@ module ActiveRecord
     module SQLServer
       module Version
 
-        VERSION = '4.2.0'
+        VERSION = '4.2.1'
 
       end
     end

data/lib/active_record/sqlserver_base.rb

@@ -18,13 +18,5 @@ module ActiveRecord
       ConnectionAdapters::SQLServerAdapter.new(nil, logger, nil, config.merge(mode: mode))
     end
 
-    def self.did_retry_sqlserver_connection(connection, count)
-      logger.info "CONNECTION RETRY: #{connection.class.name} retry ##{count}."
-    end
-
-    def self.did_lose_sqlserver_connection(connection)
-      logger.info "CONNECTION LOST: #{connection.class.name}"
-    end
-
   end
 end

data/test/cases/connection_test_sqlserver.rb

@@ -109,72 +109,6 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
       assert connection.active?
     end
 
-    describe 'with a deadlock victim exception 1205' do
-
-      describe 'outside a transaction' do
-
-        before do
-          @query = "SELECT 1 as [one]"
-          @expected = connection.execute(@query)
-          # Execute the query to get a handle of the expected result, which
-          # will be returned after a simulated deadlock victim (1205).
-          raw_conn = connection.raw_connection
-          stubbed_handle = raw_conn.execute(@query)
-          connection.send(:finish_statement_handle, stubbed_handle)
-          raw_conn.stubs(:execute).raises(deadlock_victim_exception(@query)).then.returns(stubbed_handle)
-        end
-
-        it 'raise ActiveRecord::DeadlockVictim' do
-          assert_raise(ActiveRecord::DeadlockVictim) do
-            assert_equal @expected, connection.execute(@query)
-          end
-        end
-
-      end
-
-      describe 'within a transaction' do
-
-        before do
-          @query = "SELECT 1 as [one]"
-          @expected = connection.execute(@query)
-          # We "stub" the execute method to simulate raising a deadlock victim exception once.
-          connection.class.class_eval do
-            def execute_with_deadlock_exception(sql, *args)
-              if !@raised_deadlock_exception && sql == "SELECT 1 as [one]"
-                sql = "RAISERROR('Transaction (Process ID #{Process.pid}) was deadlocked on lock resources with another process and has been chosen as the deadlock victim. Rerun the transaction.: #{sql}', 13, 1)"
-                @raised_deadlock_exception = true
-              elsif @raised_deadlock_exception == true && sql =~ /RAISERROR\('Transaction \(Process ID \d+\) was deadlocked on lock resources with another process and has been chosen as the deadlock victim\. Rerun the transaction\.: SELECT 1 as \[one\]', 13, 1\)/
-                sql = "SELECT 1 as [one]"
-              end
-              execute_without_deadlock_exception(sql, *args)
-            end
-            alias :execute_without_deadlock_exception :execute
-            alias :execute :execute_with_deadlock_exception
-          end
-        end
-
-        after do
-          # Cleanup the "stubbed" execute method.
-          connection.class.class_eval do
-            alias :execute :execute_without_deadlock_exception
-            remove_method :execute_with_deadlock_exception
-            remove_method :execute_without_deadlock_exception
-          end
-          connection.send(:remove_instance_variable, :@raised_deadlock_exception)
-        end
-
-        it 'raise ActiveRecord::DeadlockVictim if retry disabled' do
-          assert_raise(ActiveRecord::DeadlockVictim) do
-            ActiveRecord::Base.transaction do
-              assert_equal @expected, connection.execute(@query)
-            end
-          end
-        end
-
-      end
-
-    end if connection_mode_dblib? # Since it is easier to test, but feature should work in ODBC too.
-
   end
 
 
@@ -205,12 +139,4 @@ class ConnectionTestSQLServer < ActiveRecord::TestCase
     GC.enable
   end
 
-  def deadlock_victim_exception(sql)
-    require 'tiny_tds/error'
-    error = TinyTds::Error.new("Transaction (Process ID #{Process.pid}) was deadlocked on lock resources with another process and has been chosen as the deadlock victim. Rerun the transaction.: #{sql}")
-    error.severity = 13
-    error.db_error_number = 1205
-    error
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Ken Collins