activerecord-sqlserver-adapter 4.2.18 → 5.0.0

data/test/cases/schema_test_sqlserver.rb

@@ -13,8 +13,8 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
   describe 'When table is in non-dbo schema' do
 
     it 'work with table exists' do
-      assert connection.table_exists?('test.sst_schema_natural_id')
-      assert connection.table_exists?('[test].[sst_schema_natural_id]')
+      assert connection.data_source_exists?('test.sst_schema_natural_id')
+      assert connection.data_source_exists?('[test].[sst_schema_natural_id]')
     end
 
     it 'find primary key for tables with odd schema' do

data/test/cases/showplan_test_sqlserver.rb

@@ -19,7 +19,7 @@ class ShowplanTestSQLServer < ActiveRecord::TestCase
       plan.must_include "Clustered Index Seek", 'make sure we do not showplan the sp_executesql'
     end
 
-    it 'from prepared statement ...' do
+    it 'from prepared statement' do
       plan = Car.where(name: ',').limit(1).explain
       plan.must_include " SELECT  [cars].* FROM [cars] WHERE [cars].[name]"
       plan.must_include "TOP EXPRESSION", 'make sure we do not showplan the sp_executesql'

data/test/cases/specific_schema_test_sqlserver.rb

@@ -45,7 +45,7 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
 
   it 'default strings before save' do
     default = SSTestStringDefault.new
-    assert_equal nil, default.string_with_null_default
+    assert_nil default.string_with_null_default
     assert_equal 'null', default.string_with_pretend_null_one
     assert_equal '(null)', default.string_with_pretend_null_two
     assert_equal 'NULL', default.string_with_pretend_null_three
@@ -55,7 +55,7 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
 
   it 'default strings after save' do
     default = SSTestStringDefault.create
-    assert_equal nil, default.string_with_null_default
+    assert_nil default.string_with_null_default
     assert_equal 'null', default.string_with_pretend_null_one
     assert_equal '(null)', default.string_with_pretend_null_two
     assert_equal 'NULL', default.string_with_pretend_null_three
@@ -94,7 +94,7 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
   end
 
   it 'use primary key for row table order in pagination sql' do
-    sql = /ORDER BY \[sst_natural_pk_data\]\.\[legacy_id\] ASC OFFSET 5 ROWS FETCH NEXT 5 ROWS ONLY/
+    sql = /ORDER BY \[sst_natural_pk_data\]\.\[legacy_id\] ASC OFFSET @0 ROWS FETCH NEXT @1 ROWS ONLY/
     assert_sql(sql) { SSTestNaturalPkData.limit(5).offset(5).load }
   end
 
@@ -117,9 +117,10 @@ class SpecificSchemaTestSQLServer < ActiveRecord::TestCase
     assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: value.new).first }
     assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: value.new).first }
     # Using our custom char type data.
-    data = ActiveRecord::Type::SQLServer::Char::Data
-    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: data.new('T')).first }
-    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: data.new('T')).first }
+    type = ActiveRecord::Type::SQLServer::Char
+    data = ActiveRecord::Type::SQLServer::Data
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: data.new('T', type.new)).first }
+    assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: data.new('T', type.new)).first }
     # Taking care of everything.
     assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(char_col: 'T').first }
     assert_sql(/@0 = 'T'/) { SSTestDatatypeMigration.where(varchar_col: 'T').first }
@@ -164,12 +165,4 @@ 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/cases/transaction_test_sqlserver.rb

@@ -5,7 +5,7 @@ require 'models/developer'
 
 class TransactionTestSQLServer < ActiveRecord::TestCase
 
-  self.use_transactional_fixtures = false
+  self.use_transactional_tests = false
 
   before { delete_ships }
 

data/test/cases/uuid_test_sqlserver.rb

@@ -11,7 +11,6 @@ class SQLServerUuidTest < ActiveRecord::TestCase
   end
 
   it 'can create with a new pk' do
-    # Type::Uuid::ACCEPTABLE_UUID
     obj = SSTestUuid.create!
     obj.id.must_be :present?
     obj.id.must_match acceptable_uuid

data/test/config.yml

@@ -1,4 +1,3 @@
-default_connection: dblib
 
 default_connection_info: &default_connection_info
   adapter: sqlserver
@@ -30,12 +29,3 @@ connections:
       azure: <%= !ENV['ACTIVERECORD_UNITTEST_AZURE'].nil? %>
       timeout: <%= ENV['ACTIVERECORD_UNITTEST_AZURE'].present? ? 20 : nil %>
 
-  odbc:
-    arunit:
-      <<: *default_connection_info
-      dsn: <%= ENV['ACTIVERECORD_UNITTEST_DSN'] || 'activerecord_unittest' %>
-    arunit2:
-      <<: *default_connection_info
-      database: activerecord_unittest2
-      dsn: <%= ENV['ACTIVERECORD_UNITTEST2_DSN'] || 'activerecord_unittest2' %>
-

data/test/migrations/transaction_table/1_table_will_never_be_created.rb

@@ -2,7 +2,7 @@ class TableWillNeverBeCreated < ActiveRecord::Migration
 
   def self.up
     create_table(:sqlserver_trans_table1) {  }
-    create_table(:sqlserver_trans_table2) { raise ActiveRecord::StatementInvalid }
+    create_table(:sqlserver_trans_table2) { raise('HELL') }
   end
 
   def self.down

data/test/schema/sqlserver_specific_schema.rb

@@ -204,20 +204,4 @@ 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

data/test/support/coerceable_test_sqlserver.rb

@@ -25,7 +25,7 @@ module ARTest
             undef_method(method)
             once = true
           end
-          STDOUT.puts "Info: Undefined all tests: #{self.name}"
+          STDOUT.puts "🙉 🙈 🙊  Undefined all tests: #{self.name}"
         end
 
         private
@@ -34,7 +34,11 @@ module ARTest
           method = instance_methods(false).select { |m| m =~ method } if method.is_a?(Regexp)
           Array(method).each do |m|
             result = undef_method(m) if m && method_defined?(m)
-            STDOUT.puts "Info: Undefined coerced test: #{self.name}##{m}" unless result.blank?
+            if result.blank?
+              STDOUT.puts "🐳  Unfound coerced test: #{self.name}##{m}"
+            else
+              STDOUT.puts "🐵  Undefined coerced test: #{self.name}##{m}"
+            end
           end
         end
 

data/test/support/connection_reflection.rb

@@ -24,10 +24,6 @@ module ARTest
         rc.respond_to?(:tds_73?) && rc.tds_73?
       end
 
-      def connection_odbc?
-        connection_options[:mode] == :odbc
-      end
-
       def connection_sqlserver_azure?
         connection.sqlserver_azure?
       end

data/test/support/sql_counter_sqlserver.rb

@@ -1,32 +1,28 @@
 module ARTest
   module SQLServer
 
-    extend self
+    module SqlCounterSqlserver
 
-    attr_accessor :sql_counter_listenter
+      # Only return the log vs. log_all
+      def capture_sql_ss
+        ActiveRecord::SQLCounter.clear_log
+        yield
+        ActiveRecord::SQLCounter.log.dup
+      end
 
-    def ignored_sql
-      [ /SELECT SCOPE_IDENTITY/,
-        /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/,
-        /SELECT @@version/,
-        /SELECT @@TRANCOUNT/,
-        /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
-        /SELECT CAST\(.* AS .*\) AS value/ ]
     end
 
-    def sql_counter_listenters
-      ActiveSupport::Notifications.notifier.listeners_for('sql.active_record').select do |listener|
-        listener.inspect =~ /ActiveRecord::SQLCounter/
-      end
-    end
+    ignored_sql = [
+      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/im,
+      /SELECT @@version/,
+      /SELECT @@TRANCOUNT/,
+      /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
+      /SELECT CAST\(.* AS .*\) AS value/,
+      /SELECT DATABASEPROPERTYEX/im
+    ]
 
-    def sql_counter_listenters_unsubscribe
-      sql_counter_listenters.each { |listener| ActiveSupport::Notifications.unsubscribe(listener) }
-    end
+    sqlcounter = ObjectSpace.each_object(ActiveRecord::SQLCounter).to_a.first
+    sqlcounter.instance_variable_set :@ignore, Regexp.union(ignored_sql.push(sqlcounter.ignore))
 
   end
 end
-
-ActiveRecord::SQLCounter.ignored_sql.concat ARTest::SQLServer.ignored_sql
-ARTest::SQLServer.sql_counter_listenters_unsubscribe
-ARTest::SQLServer.sql_counter_listenter = ActiveSupport::Notifications.subscribe 'sql.active_record', ActiveRecord::SQLCounter.new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 4.2.18
+  version: 5.0.0
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -22,14 +22,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.0.0
 description: ActiveRecord SQL Server Adapter. SQL Server 2012 and upward.
 email:
 - ken@metaskills.net
@@ -45,6 +45,7 @@ files:
 - Gemfile
 - Guardfile
 - MIT-LICENSE
+- RAILS5-TODO.md
 - README.md
 - RUNNING_UNIT_TESTS.md
 - Rakefile
@@ -56,18 +57,18 @@ files:
 - lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/explain_subscriber.rb
-- lib/active_record/connection_adapters/sqlserver/core_ext/odbc.rb
 - lib/active_record/connection_adapters/sqlserver/database_limits.rb
 - lib/active_record/connection_adapters/sqlserver/database_statements.rb
 - lib/active_record/connection_adapters/sqlserver/database_tasks.rb
 - lib/active_record/connection_adapters/sqlserver/errors.rb
 - lib/active_record/connection_adapters/sqlserver/quoting.rb
-- lib/active_record/connection_adapters/sqlserver/schema_cache.rb
 - lib/active_record/connection_adapters/sqlserver/schema_creation.rb
+- lib/active_record/connection_adapters/sqlserver/schema_dumper.rb
 - lib/active_record/connection_adapters/sqlserver/schema_statements.rb
 - lib/active_record/connection_adapters/sqlserver/showplan.rb
 - lib/active_record/connection_adapters/sqlserver/showplan/printer_table.rb
 - lib/active_record/connection_adapters/sqlserver/showplan/printer_xml.rb
+- lib/active_record/connection_adapters/sqlserver/sql_type_metadata.rb
 - lib/active_record/connection_adapters/sqlserver/table_definition.rb
 - lib/active_record/connection_adapters/sqlserver/transaction.rb
 - lib/active_record/connection_adapters/sqlserver/type.rb
@@ -75,6 +76,7 @@ files:
 - lib/active_record/connection_adapters/sqlserver/type/binary.rb
 - lib/active_record/connection_adapters/sqlserver/type/boolean.rb
 - lib/active_record/connection_adapters/sqlserver/type/char.rb
+- lib/active_record/connection_adapters/sqlserver/type/data.rb
 - lib/active_record/connection_adapters/sqlserver/type/date.rb
 - lib/active_record/connection_adapters/sqlserver/type/datetime.rb
 - lib/active_record/connection_adapters/sqlserver/type/datetime2.rb
@@ -194,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.

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

@@ -1,34 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module SQLServer
-      module CoreExt
-        module ODBC
-
-          module Statement
-
-            def finished?
-              connected?
-              false
-            rescue ::ODBC::Error
-              true
-            end
-
-          end
-
-          module Database
-
-            def run_block(*args)
-              yield sth = run(*args)
-              sth.drop
-            end
-
-          end
-
-        end
-      end
-    end
-  end
-end
-
-ODBC::Statement.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ODBC::Statement
-ODBC::Database.send :include, ActiveRecord::ConnectionAdapters::SQLServer::CoreExt::ODBC::Database

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

@@ -1,114 +0,0 @@
-module ActiveRecord
-  module ConnectionAdapters
-    module SQLServer
-      class SchemaCache < ActiveRecord::ConnectionAdapters::SchemaCache
-
-        def initialize(conn)
-          super
-          @views = {}
-          @view_information = {}
-        end
-
-        # Superclass Overrides
-
-        def primary_keys(table_name)
-          name = key(table_name)
-          @primary_keys[name] ||= table_exists?(table_name) ? connection.primary_key(table_name) : nil
-        end
-
-        def table_exists?(table_name)
-          name = key(table_name)
-          prepare_tables_and_views
-          return @tables[name] if @tables.key? name
-          table_exists = @tables[name] = connection.table_exists?(table_name)
-          table_exists || view_exists?(table_name)
-        end
-
-        def tables(name)
-          super(key(name))
-        end
-
-        def columns(table_name)
-          name = key(table_name)
-          @columns[name] ||= connection.columns(table_name)
-        end
-
-        def columns_hash(table_name)
-          name = key(table_name)
-          @columns_hash[name] ||= Hash[columns(table_name).map { |col|
-            [col.name, col]
-          }]
-        end
-
-        def clear!
-          super
-          @views.clear
-          @view_information.clear
-        end
-
-        def size
-          super + [@views, @view_information].map{ |x| x.size }.inject(:+)
-        end
-
-        def clear_table_cache!(table_name)
-          name = key(table_name)
-          @columns.delete name
-          @columns_hash.delete name
-          @primary_keys.delete name
-          @tables.delete name
-          @views.delete name
-          @view_information.delete name
-        end
-
-        def marshal_dump
-          super + [@views, @view_information]
-        end
-
-        def marshal_load(array)
-          @views, @view_information = array[-2..-1]
-          super(array[0..-3])
-        end
-
-        # SQL Server Specific
-
-        def view_exists?(table_name)
-          name = key(table_name)
-          prepare_tables_and_views
-          return @views[name] if @views.key? name
-          @views[name] = connection.views.include?(table_name)
-        end
-
-        def view_information(table_name)
-          name = key(table_name)
-          return @view_information[name] if @view_information.key? name
-          @view_information[name] = connection.send(:view_information, table_name)
-        end
-
-
-        private
-
-        def identifier(table_name)
-          SQLServer::Utils.extract_identifiers(table_name)
-        end
-
-        def key(table_name)
-          identifier(table_name).quoted
-        end
-
-        def prepare_tables_and_views
-          prepare_views if @views.empty?
-          prepare_tables if @tables.empty?
-        end
-
-        def prepare_tables
-          connection.tables.each { |table| @tables[key(table)] = true }
-        end
-
-        def prepare_views
-          connection.views.each { |view| @views[key(view)] = true }
-        end
-
-      end
-    end
-  end
-end