activerecord-sqlserver-adapter 7.0.1.0 → 7.0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b2be5773d5cd15b49d3e11adcb9f464730316716e28823ed517b21f4bcff205
-  data.tar.gz: 69588165e5c5fb13f262c3aab89a43fb33da26c0c4688fc4d26bbc1e754c1341
+  metadata.gz: 9c5135f809d1709197eef056bbac22e09adefd4ead979cc32e72a2e12c52453a
+  data.tar.gz: 6a0f0b78026468b273926d259a93c7edb38dc8de176f88e32d8bd64c1667c90c
 SHA512:
-  metadata.gz: e3dcbc98ce8064c3e44ccab64c197ef9aeb3ce2e34c0f1829eabf5d16157a984d4f2f151b2ea69586ce1247b55363c6a210ca14c3cd8952151e52ce9ee7dff09
-  data.tar.gz: 8ac25a4fc712a546b395e30c38936a98350b97826f8868ad2d8e4d378efe0065730619248da93991ba08dbb283303c9ccbeb7e5a5d0492fc5252b97395eb66cb
+  metadata.gz: 299fe79b88ebbfb2edfac1145c4969c3cde3e7eec25bf5415e671b8bc5e3564cf66cca398a1ca7285cc1b4950a0a0326162860b359a41e018c4bae8c058921ba
+  data.tar.gz: 13566655cfaba356a7b1a1f63e95ad2a38ab0a95a6f85eaf9af4571e04ee1db03e8b2cbd4a9d58599de289c3769046e27ee23ef3898219ecc55fd24f7ec31faf

data/.github/workflows/ci.yml

@@ -14,9 +14,9 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 2.7.5
-          - 3.0.3
-          - 3.1.0
+          - 2.7.7
+          - 3.1.3
+          - 3.2.1
 
     steps:
       - name: Checkout code

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## v7.0.2.0
+
+[Full changelog](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/compare/v7.0.1.0...v7.0.2.0)
+
+#### Fixed
+
+- [#1049](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1049) Fix for inserting records into non-dbo schema table.
+
 ## v7.0.1.0
 
 [Full changelog](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/compare/v7.0.0.0...v7.0.1.0)

data/Dockerfile.ci

@@ -1,6 +1,6 @@
-ARG TARGET_VERSION=2.6.3
+ARG TARGET_VERSION=3.2.1
 
-FROM railssqlserver/activerecord-sqlserver-adapter:${TARGET_VERSION}
+FROM ghcr.io/rails-sqlserver/activerecord-sqlserver-adapter:${TARGET_VERSION}
 
 ENV WORKDIR /activerecord-sqlserver-adapter
 

data/VERSION

@@ -1 +1 @@
-7.0.1.0
+7.0.2.0

data/docker-compose.ci.yml

@@ -1,7 +1,7 @@
 version: "2.2"
 services:
   sqlserver:
-    image: metaskills/mssql-server-linux-rails
+    image: ghcr.io/rails-sqlserver/mssql-server-linux-rails
   ci:
     environment:
       - ACTIVERECORD_UNITTEST_HOST=sqlserver

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

@@ -397,14 +397,12 @@ module ActiveRecord
         end
 
         def query_requires_identity_insert?(sql)
-          if insert_sql?(sql)
-            table_name = get_table_name(sql)
-            id_column = identity_columns(table_name).first
-            # id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? quote_table_name(table_name) : false
-            id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? table_name : false
-          else
-            false
-          end
+          return false unless insert_sql?(sql)
+
+          raw_table_name = get_raw_table_name(sql)
+          id_column = identity_columns(raw_table_name).first
+
+          id_column && sql =~ /^\s*(INSERT|EXEC sp_executesql N'INSERT)[^(]+\([^)]*\b(#{id_column.name})\b,?[^)]*\)/i ? SQLServer::Utils.extract_identifiers(raw_table_name).object : false
         end
 
         def insert_sql?(sql)

data/test/cases/adapter_test_sqlserver.rb

@@ -197,7 +197,7 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       @identity_insert_sql_unordered_sp = "EXEC sp_executesql N'INSERT INTO [funny_jokes] ([name],[id]) VALUES (@0, @1)', N'@0 nvarchar(255), @1  int', @0 = N'Knock knock', @1 = 420"
     end
 
-    it "return quoted table_name to #query_requires_identity_insert? when INSERT sql contains id column" do
+    it "return unquoted table_name to #query_requires_identity_insert? when INSERT sql contains id column" do
       assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql)
       assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_unquoted)
       assert_equal "funny_jokes", connection.send(:query_requires_identity_insert?, @identity_insert_sql_unordered)

data/test/cases/schema_test_sqlserver.rb

@@ -21,6 +21,7 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
 
     it "have only one identity column" do
       columns = connection.columns("test.sst_schema_identity")
+
       assert_equal 2, columns.size
       assert_equal 1, columns.select { |c| c.is_identity? }.size
     end
@@ -29,6 +30,7 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
       test_columns = connection.columns("test.sst_schema_columns")
       dbo_columns = connection.columns("dbo.sst_schema_columns")
       columns = connection.columns("sst_schema_columns") # This returns table from dbo schema
+
       assert_equal 7, test_columns.size
       assert_equal 2, dbo_columns.size
       assert_equal 2, columns.size
@@ -39,10 +41,15 @@ class SchemaTestSQLServer < ActiveRecord::TestCase
 
     it "return correct varchar and nvarchar column limit length when table is in non dbo schema" do
       columns = connection.columns("test.sst_schema_columns")
+
       assert_equal 255, columns.find { |c| c.name == "name" }.limit
       assert_equal 1000, columns.find { |c| c.name == "description" }.limit
       assert_equal 255, columns.find { |c| c.name == "n_name" }.limit
       assert_equal 1000, columns.find { |c| c.name == "n_description" }.limit
     end
+
+    it "creates new record" do
+      Alien.create!(name: 'Trisolarans')
+    end
   end
 end

data/test/models/sqlserver/alien.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+class Alien < ActiveRecord::Base
+  self.table_name = "test.aliens"
+end

data/test/schema/sqlserver_specific_schema.rb

@@ -312,4 +312,11 @@ ActiveRecord::Schema.define do
       CONSTRAINT PK_sst_composite_with_identity PRIMARY KEY (pk_col_one, pk_col_two)
     );
   COMPOSITE_WITH_IDENTITY
+
+  execute "IF EXISTS(SELECT * FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'aliens' and TABLE_SCHEMA = 'test') DROP TABLE test.aliens"
+  execute <<-TABLE_IN_OTHER_SCHEMA_USED_BY_MODEL
+    CREATE TABLE test.aliens(
+      name varchar(255)
+    )
+  TABLE_IN_OTHER_SCHEMA_USED_BY_MODEL
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.0.1.0
+  version: 7.0.2.0
 platform: ruby
 authors:
 - Ken Collins
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -181,6 +181,7 @@ files:
 - test/migrations/create_clients_and_change_column_collation.rb
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
+- test/models/sqlserver/alien.rb
 - test/models/sqlserver/booking.rb
 - test/models/sqlserver/composite_pk.rb
 - test/models/sqlserver/customers_view.rb
@@ -227,8 +228,8 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/issues
-  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.0.1.0/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.1.0
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.0.2.0/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.2.0
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -293,6 +294,7 @@ test_files:
 - test/migrations/create_clients_and_change_column_collation.rb
 - test/migrations/create_clients_and_change_column_null.rb
 - test/migrations/transaction_table/1_table_will_never_be_created.rb
+- test/models/sqlserver/alien.rb
 - test/models/sqlserver/booking.rb
 - test/models/sqlserver/composite_pk.rb
 - test/models/sqlserver/customers_view.rb