activerecord-sqlserver-adapter 7.1.0.rc1 → 7.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ca12c2b62c162e798e40d6ca3ec7861e736835d8d91f132eef16240dcfeb02
-  data.tar.gz: ddf249b287e32a11a03ea4b2a9bfe85dbbded619d83165559f108892d90da658
+  metadata.gz: ddd1e2bb81c9a6675d4a8f561c585869b0fafb6ecfe3c513e7e69d8bc3646d9f
+  data.tar.gz: 0d669eaaa14be843acc19cc887c47a3f8eecfb3552e8477a062df688d9ef1172
 SHA512:
-  metadata.gz: dde118ab5b86cd3b154739ce66933e8d4f3380503e6626796941c93cd08775571ad1f6b1630d7a5882b8dc97e0cd5475a7043fd8ac792af723e7c85720ff2271
-  data.tar.gz: 80efec8b5e389f05c57a1a2bab01cae17addbda59ec772a602f9aa1e4212508301a954b32d795d0ec6898c161226d36664a169f834c3f34e3ce1fd1c34a56d0e
+  metadata.gz: 879aeb90caaef5bb0218651407ec5a978d4a62d51682e92d55fbda2d3eed2fd37e8348e72aa8c4c92cab856c8eebc2fa4bf1c2166ad13d99c983f1310d3b66ab
+  data.tar.gz: 15030862f3ae2044dd780a62f4a8868dc383cd6e9775fcedff214b1429bdbf2881be503e670cf2cbcfcbe92c0583c2a89d53f30ddd988a5425649ff29ef2c971

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## v7.1.0.rc2
+
+#### Added
+
+- [#1136](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1136) Prevent marking broken connections as verified
+- [#1138](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1138) Cache quoted names
+
 ## v7.1.0.rc1
 
 #### Added

data/README.md

@@ -13,7 +13,7 @@ Interested in older versions? We follow a rational versioning policy that tracks
 
 | Adapter Version | Rails Version | Support        | Branch                                                                                          |
 |-----------------|---------------|----------------|-------------------------------------------------------------------------------------------------|
-| `7.1.0.rc1` | `7.1.x`       | In development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)       |
+| `7.1.0.rc2`    | `7.1.x`       | In development | [main](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)       |
 | `7.0.5.1`       | `7.0.x`       | Active         | [7-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/7-0-stable) |
 | `6.1.3.0`       | `6.1.x`       | Active         | [6-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
 | `6.0.3`         | `6.0.x`       | Ended          | [6-0-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |

data/VERSION

@@ -1 +1 @@
-7.1.0.rc1
+7.1.0.rc2

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

@@ -23,6 +23,7 @@ module ActiveRecord
                        else
                          internal_raw_execute(sql, conn, perform_do: true)
                        end
+              verified!
             end
           end
 
@@ -50,6 +51,7 @@ module ActiveRecord
               else
                 result = internal_exec_sql_query(sql, conn)
               end
+              verified!
             end
           end
 
@@ -175,6 +177,7 @@ module ActiveRecord
           log(sql, "Execute Procedure") do
             with_raw_connection do |conn|
               result = internal_raw_execute(sql, conn)
+              verified!
               options = { as: :hash, cache_rows: true, timezone: ActiveRecord.default_timezone || :utc }
 
               result.each(options) do |row|

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

@@ -4,18 +4,18 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Quoting
-        QUOTED_TRUE  = "1".freeze
-        QUOTED_FALSE = "0".freeze
-        QUOTED_STRING_PREFIX = "N".freeze
+        QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
+        QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
 
         def fetch_type_metadata(sql_type, sqlserver_options = {})
           cast_type = lookup_cast_type(sql_type)
+
           simple_type = SqlTypeMetadata.new(
-            sql_type: sql_type,
-            type: cast_type.type,
-            limit: cast_type.limit,
+            sql_type:  sql_type,
+            type:      cast_type.type,
+            limit:     cast_type.limit,
             precision: cast_type.precision,
-            scale: cast_type.scale
+            scale:     cast_type.scale
           )
 
           SQLServer::TypeMetadata.new(simple_type, **sqlserver_options)
@@ -34,7 +34,11 @@ module ActiveRecord
         end
 
         def quote_column_name(name)
-          SQLServer::Utils.extract_identifiers(name).quoted
+          QUOTED_COLUMN_NAMES[name] ||= SQLServer::Utils.extract_identifiers(name).quoted
+        end
+
+        def quote_table_name(name)
+          QUOTED_TABLE_NAMES[name] ||= SQLServer::Utils.extract_identifiers(name).quoted
         end
 
         def quote_default_expression(value, column)
@@ -47,7 +51,7 @@ module ActiveRecord
         end
 
         def quoted_true
-          QUOTED_TRUE
+          '1'
         end
 
         def unquoted_true
@@ -55,7 +59,7 @@ module ActiveRecord
         end
 
         def quoted_false
-          QUOTED_FALSE
+          '0'
         end
 
         def unquoted_false
@@ -117,7 +121,7 @@ module ActiveRecord
           when ActiveRecord::Type::SQLServer::Data
             value.quoted
           when String, ActiveSupport::Multibyte::Chars
-            "#{QUOTED_STRING_PREFIX}#{super}"
+            "N#{super}"
           else
             super
           end

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

@@ -6,13 +6,9 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLServer
       module Utils
-        QUOTED_STRING_PREFIX = "N"
-
         # Value object to return identifiers from SQL Server names http://bit.ly/1CZ3EiL
         # Inspired from Rails PostgreSQL::Name adapter object in their own Utils.
-        #
         class Name
-          SEPARATOR = "."
           UNQUOTED_SCANNER = /\]?\./
           QUOTED_SCANNER   = /\A\[.*?\]\./
           QUOTED_CHECKER   = /\A\[/
@@ -42,7 +38,7 @@ module ActiveRecord
           end
 
           def fully_qualified_database_quoted
-            [server_quoted, database_quoted].compact.join(SEPARATOR)
+            [server_quoted, database_quoted].compact.join('.')
           end
 
           def fully_qualified?
@@ -69,7 +65,7 @@ module ActiveRecord
           end
 
           def quoted
-            parts.map { |p| quote(p) if p }.join SEPARATOR
+            parts.map { |p| quote(p) if p }.join('.')
           end
 
           def quoted_raw
@@ -132,7 +128,7 @@ module ActiveRecord
         extend self
 
         def quote_string(s)
-          s.to_s.gsub /\'/, "''"
+          s.to_s.gsub(/\'/, "''")
         end
 
         def quote_string_single(s)
@@ -140,7 +136,7 @@ module ActiveRecord
         end
 
         def quote_string_single_national(s)
-          "#{QUOTED_STRING_PREFIX}'#{quote_string(s)}'"
+          "N'#{quote_string(s)}'"
         end
 
         def quoted_raw(name)

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -53,7 +53,7 @@ module ActiveRecord
       end
 
       def clear_active_connections!
-        ActiveRecord::Base.connection_handler.clear_active_connections!
+        ActiveRecord::Base.connection_handler.clear_active_connections!(:all)
       end
 
       def structure_dump(filename, extra_flags)

data/lib/arel/visitors/sqlserver.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.1.0.rc1
+  version: 7.1.0.rc2
 platform: ruby
 authors:
 - Ken Collins
@@ -15,7 +15,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-09 00:00:00.000000000 Z
+date: 2023-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -235,8 +235,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.1.0.rc1/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.0.rc1
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.1.0.rc2/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.0.rc2
 post_install_message:
 rdoc_options: []
 require_paths: