activerecord-sqlserver-adapter 7.0.5.0 → 7.1.0.beta1

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -10,8 +10,7 @@ module ActiveRecord
     class SQLServerDatabaseTasks
       DEFAULT_COLLATION = "SQL_Latin1_General_CP1_CI_AS"
 
-      delegate :connection, :establish_connection, :clear_active_connections!,
-               to: ActiveRecord::Base
+      delegate :connection, :establish_connection, to: ActiveRecord::Base
 
       def self.using_database_configurations?
         true
@@ -53,6 +52,10 @@ module ActiveRecord
         create true
       end
 
+      def clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!
+      end
+
       def structure_dump(filename, extra_flags)
         server_arg = "-S #{Shellwords.escape(configuration_hash[:host])}"
         server_arg += ":#{Shellwords.escape(configuration_hash[:port])}" if configuration_hash[:port]

data/lib/arel/visitors/sqlserver.rb

@@ -64,39 +64,6 @@ module Arel
         super
       end
 
-      def visit_Arel_Nodes_HomogeneousIn(o, collector)
-        collector.preparable = false
-
-        collector << quote_table_name(o.table_name) << "." << quote_column_name(o.column_name)
-
-        if o.type == :in
-          collector << " IN ("
-        else
-          collector << " NOT IN ("
-        end
-
-        values = o.casted_values
-
-        if values.empty?
-          collector << @connection.quote(nil)
-        elsif @connection.prepared_statements
-          # Monkey-patch start. Add query attribute bindings rather than just values.
-          column_name = o.column_name
-          column_type = o.attribute.relation.type_for_attribute(o.column_name)
-          # Use cast_type on encrypted attributes. Don't encrypt them again
-          column_type = column_type.cast_type if column_type.is_a?(ActiveRecord::Encryption::EncryptedAttributeType)
-          attrs = values.map { |value| ActiveRecord::Relation::QueryAttribute.new(column_name, value, column_type) }
-
-          collector.add_binds(attrs, &bind_block)
-          # Monkey-patch end.
-        else
-          collector.add_binds(values, &bind_block)
-        end
-
-        collector << ")"
-        collector
-      end
-
       def visit_Arel_Nodes_SelectStatement(o, collector)
         @select_statement = o
         distinct_One_As_One_Is_So_Not_Fetch o

data/test/cases/adapter_test_sqlserver.rb

@@ -19,7 +19,6 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
     string = connection.inspect
     _(string).must_match %r{ActiveRecord::ConnectionAdapters::SQLServerAdapter}
     _(string).must_match %r{version\: \d.\d}
-    _(string).must_match %r{mode: dblib}
     _(string).must_match %r{azure: (true|false)}
     _(string).wont_match %r{host}
     _(string).wont_match %r{password}
@@ -102,16 +101,18 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   it "test bad connection" do
     assert_raise ActiveRecord::NoDatabaseError do
       db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary")
-      configuration = db_config.configuration_hash.merge(database: "inexistent_activerecord_unittest")
-      ActiveRecord::Base.sqlserver_connection configuration
+      configuration = db_config.configuration_hash.merge(database: "nonexistent_activerecord_unittest")
+
+      connection = ActiveRecord::Base.sqlserver_connection configuration
+      connection.exec_query("SELECT 1")
     end
   end
 
   it "test database exists returns false if database does not exist" do
     db_config = ActiveRecord::Base.configurations.configs_for(env_name: "arunit", name: "primary")
-    configuration = db_config.configuration_hash.merge(database: "inexistent_activerecord_unittest")
+    configuration = db_config.configuration_hash.merge(database: "nonexistent_activerecord_unittest")
     assert_not ActiveRecord::ConnectionAdapters::SQLServerAdapter.database_exists?(configuration),
-               "expected database to not exist"
+               "expected database #{configuration[:database]} to not exist"
   end
 
   it "test database exists returns true when the database exists" do
@@ -306,7 +307,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
   end
 
   describe "database statements" do
-    it "run the database consistency checker useroptions command" do
+    it "run the database consistency checker 'user_options' command" do
       skip "on azure" if connection_sqlserver_azure?
       keys = [:textsize, :language, :isolation_level, :dateformat]
       user_options = connection.user_options
@@ -345,7 +346,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert_equal "tinyint", connection.type_to_sql(:integer, limit: 1)
     end
 
-    it "create bigints when limit is greateer than 4" do
+    it "create bigints when limit is greater than 4" do
       assert_equal "bigint", connection.type_to_sql(:integer, limit: 5)
       assert_equal "bigint", connection.type_to_sql(:integer, limit: 6)
       assert_equal "bigint", connection.type_to_sql(:integer, limit: 7)