activerecord-sqlserver-adapter 8.0.2 → 8.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cebd5142b6e4cd7fc42be58fc02ba1be8cef17425812d28991643dec2a079743
-  data.tar.gz: dcf926a50cc90a36bb6d41b6adae4eabae84b92d3d4844c6661a9c0d60efd478
+  metadata.gz: 4eb3a0a586688c3993353fb977268ed3440893c15277decb16cfa76ea6704f1f
+  data.tar.gz: b439d90171035e52adcfe1a03b40ab55a228fd0e6d6fc272b8bde37104a8fc64
 SHA512:
-  metadata.gz: e4158590963a45ac2bd13ae2a8200554693a0ea9a5a2fd68ff17ec07ed25d8c03dd11efcbdb28b6dc0d56c7bd88df77e57c11a87ee375096077da78647ce80c0
-  data.tar.gz: 42a84013b9b6949f04d4eb99aa01b6727d2556dc2764b57454661f680eb4fe62541ce8fc05c74c7f7154c271601caf004fd864482d19115b1fc9cac152a4774a
+  metadata.gz: d7dde4f70fbd4c665701f5765acfd194a2f60c3cf540ed966d43c264fffc747c7e14a1d61674eae17648fec758d20090b47bb5086f49d8046a7ebd2494b355cd
+  data.tar.gz: 9c85aa63eedd0a1dd1387336cac08fbaf4596c4b0aeed7309af5b92183690f8a3d4803917f234258ceb3b8245e9edc5da0866c474c08031eb50149a028c2f53c

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v8.0.4
+
+#### Fixed
+
+- [#1308](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1308) Fix retrieval of temporary table's column information.
+
+## v8.0.3
+
+#### Fixed
+
+- [#1306](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1306) Fix affected rows count when lowercase schema reflection enabled
+
 ## v8.0.2
 
 #### Fixed

data/VERSION

@@ -1 +1 @@
-8.0.2
+8.0.4

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

@@ -39,7 +39,8 @@ module ActiveRecord
         end
 
         def affected_rows(raw_result)
-          raw_result.first['AffectedRows']
+          column_name = lowercase_schema_reflection ? 'affectedrows' : 'AffectedRows'
+          raw_result.first[column_name]
         end
 
         def raw_execute(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true, batch: false)

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

@@ -592,12 +592,22 @@ module ActiveRecord
         end
 
         def column_definitions_sql(database, identifier)
-          object_name = prepared_statements ? "@0" : quote(identifier.object)
-          schema_name = if identifier.schema.blank?
-                          "schema_name()"
-                        else
-                          prepared_statements ? "@1" : quote(identifier.schema)
-                        end
+          schema_name = "schema_name()"
+
+          if prepared_statements
+            object_name = "@0"
+            schema_name = "@1" if identifier.schema.present?
+          else
+            object_name = quote(identifier.object)
+            schema_name = quote(identifier.schema) if identifier.schema.present?
+          end
+
+          object_id_arg = identifier.schema.present? ? "CONCAT(#{schema_name},'.',#{object_name})" : object_name
+
+          if identifier.temporary_table?
+            database = "TEMPDB"
+            object_id_arg = "CONCAT('#{database}','..',#{object_name})"
+          end
 
           %{
             SELECT
@@ -652,7 +662,7 @@ module ActiveRecord
               AND k.unique_index_id = ic.index_id
               AND c.column_id = ic.column_id
             WHERE
-              o.name = #{object_name}
+              o.Object_ID = Object_ID(#{object_id_arg})
               AND s.name = #{schema_name}
             ORDER BY
               c.column_id
@@ -674,7 +684,7 @@ module ActiveRecord
         end
 
         def remove_default_constraint(table_name, column_name)
-          # If their are foreign keys in this table, we could still get back a 2D array, so flatten just in case.
+          # If there are foreign keys in this table, we could still get back a 2D array, so flatten just in case.
           execute_procedure(:sp_helpconstraint, table_name, "nomsg").flatten.select do |row|
             row["constraint_type"] == "DEFAULT on column #{column_name}"
           end.each do |row|

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

@@ -81,6 +81,10 @@ module ActiveRecord
             parts.hash
           end
 
+          def temporary_table?
+            object.start_with?("#")
+          end
+
           protected
 
           def parse_raw_name

data/test/cases/adapter_test_sqlserver.rb

@@ -7,6 +7,7 @@ require "models/post"
 require "models/subscriber"
 require "models/minimalistic"
 require "models/college"
+require "models/discount"
 
 class AdapterTestSQLServer < ActiveRecord::TestCase
   fixtures :tasks
@@ -183,6 +184,24 @@ class AdapterTestSQLServer < ActiveRecord::TestCase
       assert_equal "Favorite number?", SSTestUppered.last.column1
       assert SSTestUppered.columns_hash["column2"]
     end
+
+    it "destroys model with no associations" do
+      connection.lowercase_schema_reflection = true
+
+      assert_nothing_raised do
+        discount = Discount.create!
+        discount.destroy!
+      end
+    end
+
+    it "destroys model with association" do
+      connection.lowercase_schema_reflection = true
+
+      assert_nothing_raised do
+        post = Post.create!(title: 'Setup', body: 'Record to be deleted')
+        post.destroy!
+      end
+    end
   end
 
   describe "identity inserts" do

data/test/cases/temporary_table_test_sqlserver.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "cases/helper_sqlserver"
+
+class TemporaryTableSQLServer < ActiveRecord::TestCase
+  def test_insert_into_temporary_table
+    ActiveRecord::Base.with_connection do |conn|
+      conn.exec_query("CREATE TABLE #temp_users (id INT IDENTITY(1,1), name NVARCHAR(100))")
+
+      result = conn.exec_query("SELECT * FROM #temp_users")
+      assert_equal 0, result.count
+
+      conn.exec_query("INSERT INTO #temp_users (name) VALUES ('John'), ('Doe')")
+
+      result = conn.exec_query("SELECT * FROM #temp_users")
+      assert_equal 2, result.count
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 8.0.2
+  version: 8.0.4
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -176,6 +176,7 @@ files:
 - test/cases/schema_test_sqlserver.rb
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
+- test/cases/temporary_table_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
 - test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
@@ -238,8 +239,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/v8.0.2/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.2
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v8.0.4/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v8.0.4
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -294,6 +295,7 @@ test_files:
 - test/cases/schema_test_sqlserver.rb
 - test/cases/showplan_test_sqlserver.rb
 - test/cases/specific_schema_test_sqlserver.rb
+- test/cases/temporary_table_test_sqlserver.rb
 - test/cases/transaction_test_sqlserver.rb
 - test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb