activerecord-jdbcsqlserver-adapter 50.0.0 → 52.0.0

data/test/models/sqlserver/trigger.rb

@@ -0,0 +1,7 @@
+class SSTestTrigger < ActiveRecord::Base
+  self.table_name = 'sst_table_with_trigger'
+end
+
+class SSTestTriggerUuid < ActiveRecord::Base
+  self.table_name = 'sst_table_with_uuid_trigger'
+end

data/test/models/sqlserver/trigger_history.rb

@@ -0,0 +1,3 @@
+class SSTestTriggerHistory < ActiveRecord::Base
+  self.table_name = 'sst_table_with_trigger_history'
+end

data/test/schema/datatypes/2012.sql

@@ -35,6 +35,7 @@ CREATE TABLE [sst_datatypes] (
   [smalldatetime] [smalldatetime] NULL DEFAULT '1901-01-01T15:45:00.000Z',
   [time_7] [time](7) NULL DEFAULT '04:20:00.2883215',
   [time_2] [time](2) NULL,
+  [time_default] [time] NULL DEFAULT '15:03:42.0621978',
   -- Character Strings
   [char_10] [char](10) NULL DEFAULT '1234567890',
   [varchar_50] [varchar](50) NULL DEFAULT 'test varchar_50',

data/test/schema/sqlserver_specific_schema.rb

@@ -64,10 +64,6 @@ ActiveRecord::Schema.define do
     t.uuid   :uuid_nil_default, default: nil
   end
 
-  create_table '[some.Name]', force: true do |t|
-    t.varchar :name
-  end
-
   create_table 'sst_my$strange_table', force: true do |t|
     t.string :name
   end
@@ -148,12 +144,20 @@ ActiveRecord::Schema.define do
 
   # Constraints
 
-  create_table(:sst_has_fks, force: true) { |t| t.column(:fk_id, :integer, null: false) }
+  create_table(:sst_has_fks, force: true) do |t|
+    t.column(:fk_id, :bigint, null: false)
+    t.column(:fk_id2, :bigint)
+  end
+
   create_table(:sst_has_pks, force: true) { }
   execute <<-ADDFKSQL
     ALTER TABLE sst_has_fks
     ADD CONSTRAINT FK__sst_has_fks_id
     FOREIGN KEY ([fk_id])
+    REFERENCES [sst_has_pks] ([id]),
+
+    CONSTRAINT FK__sst_has_fks_id2
+    FOREIGN KEY ([fk_id2])
     REFERENCES [sst_has_pks] ([id])
   ADDFKSQL
 
@@ -181,6 +185,44 @@ ActiveRecord::Schema.define do
       FROM sst_string_defaults
   STRINGDEFAULTSBIGVIEW
 
+  # Trigger
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_trigger') DROP TABLE sst_table_with_trigger"
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_trigger_history') DROP TABLE sst_table_with_trigger_history"
+  execute <<-SQL
+    CREATE TABLE sst_table_with_trigger(
+      id bigint IDENTITY NOT NULL PRIMARY KEY,
+      event_name nvarchar(255)
+    )
+    CREATE TABLE sst_table_with_trigger_history(
+      id bigint IDENTITY NOT NULL PRIMARY KEY,
+      id_source nvarchar(36),
+      event_name nvarchar(255)
+    )
+  SQL
+  execute <<-SQL
+    CREATE TRIGGER sst_table_with_trigger_t ON sst_table_with_trigger
+    FOR INSERT
+    AS
+    INSERT INTO sst_table_with_trigger_history (id_source, event_name)
+    SELECT id AS id_source, event_name FROM INSERTED
+  SQL
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'sst_table_with_uuid_trigger') DROP TABLE sst_table_with_uuid_trigger"
+  execute <<-SQL
+    CREATE TABLE sst_table_with_uuid_trigger(
+      id uniqueidentifier DEFAULT NEWID() PRIMARY KEY,
+      event_name nvarchar(255)
+    )
+  SQL
+  execute <<-SQL
+    CREATE TRIGGER sst_table_with_uuid_trigger_t ON sst_table_with_uuid_trigger
+    FOR INSERT
+    AS
+    INSERT INTO sst_table_with_trigger_history (id_source, event_name)
+    SELECT id AS id_source, event_name FROM INSERTED
+  SQL
+
   # Another schema.
 
   create_table :sst_schema_columns, force: true do |t|

data/test/support/core_ext/query_cache.rb

@@ -0,0 +1,29 @@
+require 'active_record/connection_adapters/sqlserver_adapter'
+
+module SqlIgnoredCache
+  extend ActiveSupport::Concern
+
+  IGNORED_SQL = [
+    /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
+    /SELECT @@version/,
+    /SELECT @@TRANCOUNT/,
+    /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,
+    /SELECT CAST\(.* AS .*\) AS value/,
+    /SELECT DATABASEPROPERTYEX/im
+  ]
+
+  # We don't want to coerce every ActiveRecord test that relies on `query_cache`
+  # just because we do more queries than the other adapters.
+  #
+  # Removing internal queries from the cache will make AR tests pass without
+  # compromising cache outside tests.
+  def cache_sql(sql, name, binds)
+    result = super
+    @query_cache.delete_if { |k, v| k =~ Regexp.union(IGNORED_SQL) }
+    result
+  end
+end
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::ConnectionAdapters::SQLServerAdapter.prepend(SqlIgnoredCache)
+end

data/test/support/sql_counter_sqlserver.rb

@@ -13,7 +13,7 @@ module ARTest
     end
 
     ignored_sql = [
-      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS)/im,
+      /INFORMATION_SCHEMA\.(TABLES|VIEWS|COLUMNS|KEY_COLUMN_USAGE)/im,
       /SELECT @@version/,
       /SELECT @@TRANCOUNT/,
       /(BEGIN|COMMIT|ROLLBACK|SAVE) TRANSACTION/,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-jdbcsqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 50.0.0
+  version: 52.0.0
 platform: ruby
 authors:
 - Ken Collins
@@ -15,42 +15,42 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.2.3
   name: activerecord
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 5.2.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.6
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '50.5'
+        version: '52.7'
   name: activerecord-jdbc-adapter
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '50.5'
+        version: '52.7'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -58,8 +58,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.6.0
   name: jdbc-mssql
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -78,11 +78,10 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
-- Dockerfile
+- Dockerfile.ci
 - Gemfile
 - Guardfile
 - MIT-LICENSE
-- RAILS5-TODO.md
 - README.md
 - RUNNING_UNIT_TESTS.md
 - Rakefile
@@ -92,9 +91,12 @@ files:
 - docker-compose.ci.yml
 - lib/active_record/connection_adapters/sqlserver/core_ext/active_record.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/attribute_methods.rb
+- lib/active_record/connection_adapters/sqlserver/core_ext/calculations.rb
 - lib/active_record/connection_adapters/sqlserver/core_ext/date_time.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/finder_methods.rb
+- lib/active_record/connection_adapters/sqlserver/core_ext/query_methods.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
@@ -156,10 +158,14 @@ files:
 - lib/activerecord-sqlserver-adapter.rb
 - lib/arel/visitors/sqlserver.rb
 - lib/arel_sqlserver.rb
+- lib/jdbc_mssql_driver_loader.rb
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
+- test/bin/install-freetds.sh
+- test/bin/setup.sh
 - test/bin/wait-for.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
@@ -179,18 +185,19 @@ files:
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
+- test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
 - 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
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
 - test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/dot_table_name.rb
 - test/models/sqlserver/edge_schema.rb
 - test/models/sqlserver/fk_has_fk.rb
 - test/models/sqlserver/fk_has_pk.rb
@@ -206,6 +213,8 @@ files:
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
 - test/models/sqlserver/tinyint_pk.rb
+- test/models/sqlserver/trigger.rb
+- test/models/sqlserver/trigger_history.rb
 - test/models/sqlserver/upper.rb
 - test/models/sqlserver/uppered.rb
 - test/models/sqlserver/uuid.rb
@@ -214,6 +223,7 @@ files:
 - test/schema/sqlserver_specific_schema.rb
 - test/support/coerceable_test_sqlserver.rb
 - test/support/connection_reflection.rb
+- test/support/core_ext/query_cache.rb
 - test/support/load_schema_sqlserver.rb
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb
@@ -246,8 +256,11 @@ summary: ActiveRecord JDBC SQL Server Adapter.
 test_files:
 - test/appveyor/dbsetup.ps1
 - test/appveyor/dbsetup.sql
+- test/bin/install-freetds.sh
+- test/bin/setup.sh
 - test/bin/wait-for.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
@@ -267,18 +280,19 @@ test_files:
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
+- test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
 - 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
 - test/models/sqlserver/datatype.rb
 - test/models/sqlserver/datatype_migration.rb
 - test/models/sqlserver/dollar_table_name.rb
-- test/models/sqlserver/dot_table_name.rb
 - test/models/sqlserver/edge_schema.rb
 - test/models/sqlserver/fk_has_fk.rb
 - test/models/sqlserver/fk_has_pk.rb
@@ -294,6 +308,8 @@ test_files:
 - test/models/sqlserver/string_defaults_big_view.rb
 - test/models/sqlserver/string_defaults_view.rb
 - test/models/sqlserver/tinyint_pk.rb
+- test/models/sqlserver/trigger.rb
+- test/models/sqlserver/trigger_history.rb
 - test/models/sqlserver/upper.rb
 - test/models/sqlserver/uppered.rb
 - test/models/sqlserver/uuid.rb
@@ -302,6 +318,7 @@ test_files:
 - test/schema/sqlserver_specific_schema.rb
 - test/support/coerceable_test_sqlserver.rb
 - test/support/connection_reflection.rb
+- test/support/core_ext/query_cache.rb
 - test/support/load_schema_sqlserver.rb
 - test/support/minitest_sqlserver.rb
 - test/support/paths_sqlserver.rb

data/RAILS5-TODO.md

@@ -1,5 +0,0 @@
-
-## Rails v5.1
-
-* BIGINT PK support. https://github.com/rails/rails/pull/26266
-

data/test/models/sqlserver/dot_table_name.rb

@@ -1,3 +0,0 @@
-class SSTestDotTableName < ActiveRecord::Base
-  self.table_name = '[dbo].[some.Name]'
-end