activerecord-sqlserver-adapter 7.1.0.rc1 → 7.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42ca12c2b62c162e798e40d6ca3ec7861e736835d8d91f132eef16240dcfeb02
-  data.tar.gz: ddf249b287e32a11a03ea4b2a9bfe85dbbded619d83165559f108892d90da658
+  metadata.gz: 58c19846ce74967bacd12d1accd41c82b31f2fb04829ee8a19ea529f73dd97a7
+  data.tar.gz: 81d8ea6ee564704c1bf0178c3e28de18979892a0b18881eb3cee2f5d96052101
 SHA512:
-  metadata.gz: dde118ab5b86cd3b154739ce66933e8d4f3380503e6626796941c93cd08775571ad1f6b1630d7a5882b8dc97e0cd5475a7043fd8ac792af723e7c85720ff2271
-  data.tar.gz: 80efec8b5e389f05c57a1a2bab01cae17addbda59ec772a602f9aa1e4212508301a954b32d795d0ec6898c161226d36664a169f834c3f34e3ce1fd1c34a56d0e
+  metadata.gz: 9369b4c86d3ea8ef36eeb47a19e5e2bc5a31024ead3aa1e1d535346a486526e0e9e196d95e8f2667a57d1532f8daa5f48b7909e657eb2c699450480e23974e85
+  data.tar.gz: c10c097a4ebd447e7dd25b6f6235023773a15bbf8c3650c7cc3e73cee27b4a37c82a85b493b807b71bf5fd971258fd40300e3696b3a92f4a8e585f55e0562cf0

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v7.1.0
+
+#### Added
+
+- [#1141](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1141) Added support for check constraints.
+
+## 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

@@ -11,16 +11,16 @@ The SQL Server adapter for ActiveRecord using SQL Server 2012 or higher.
 
 Interested in older versions? We follow a rational versioning policy that tracks Rails. That means that our 7.x version of the adapter is only for the latest 7.x version of Rails. If you need the adapter for SQL Server 2008 or 2005, you are still in the right spot. Just install the latest 3.2.x to 4.1.x version of the adapter that matches your Rails version. We also have stable branches for each major/minor release of ActiveRecord.
 
-| 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.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) |
-| `5.2.1`         | `5.2.x`       | Ended          | [5-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable) |
-| `5.1.6`         | `5.1.x`       | Ended          | [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-1-stable) |
-| `4.2.18`        | `4.2.x`       | Ended          | [4-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable) |
-| `4.1.8`         | `4.1.x`       | Ended          | [4-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-1-stable) |
+| Adapter Version | Rails Version | Support | Branch                                                                                           |
+|-----------------|---------------|---------|--------------------------------------------------------------------------------------------------|
+| `7.1.0`         | `7.1.x`       | Active  | [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)  |
+| `5.2.1`         | `5.2.x`       | Ended   | [5-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable)  |
+| `5.1.6`         | `5.1.x`       | Ended   | [5-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-1-stable)  |
+| `4.2.18`        | `4.2.x`       | Ended   | [4-2-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-2-stable)  |
+| `4.1.8`         | `4.1.x`       | Ended   | [4-1-stable](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/4-1-stable)  |
 
 For older versions, please check their stable branches.
 

data/VERSION

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

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/schema_statements.rb

@@ -267,6 +267,29 @@ module ActiveRecord
           end
         end
 
+        def check_constraints(table_name)
+          sql = <<~SQL
+            select chk.name AS 'name',
+                   chk.definition AS 'expression'
+            from sys.check_constraints chk
+            inner join sys.tables st on chk.parent_object_id = st.object_id
+            where
+            st.name = '#{table_name}'
+          SQL
+
+          chk_info = internal_exec_query(sql, "SCHEMA")
+
+          chk_info.map do |row|
+            options = {
+              name: row["name"]
+            }
+            expression = row["expression"]
+            expression = expression[1..-2] if expression.start_with?("(") && expression.end_with?(")")
+
+            CheckConstraintDefinition.new(table_name, expression, options)
+          end
+        end
+
         def type_to_sql(type, limit: nil, precision: nil, scale: nil, **)
           type_limitable = %w(string integer float char nchar varchar nvarchar).include?(type.to_s)
           limit = nil unless type_limitable

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/connection_adapters/sqlserver_adapter.rb

@@ -171,6 +171,10 @@ module ActiveRecord
         true
       end
 
+      def supports_check_constraints?
+        true
+      end
+
       def supports_json?
         version_year >= 2016
       end

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

data/test/cases/coerced_tests.rb

@@ -1580,6 +1580,13 @@ class SchemaDumperTest < ActiveRecord::TestCase
 
   # Tests are not about a specific adapter.
   coerce_tests! :test_do_not_dump_foreign_keys_when_bypassed_by_config
+
+  # SQL Server formats the check constraint expression differently.
+  coerce_tests! :test_schema_dumps_check_constraints
+  def test_schema_dumps_check_constraints_coerced
+    constraint_definition = dump_table_schema("products").split(/\n/).grep(/t.check_constraint.*products_price_check/).first.strip
+    assert_equal 't.check_constraint "[price]>[discounted_price]", name: "products_price_check"', constraint_definition
+  end
 end
 
 class SchemaDumperDefaultsTest < ActiveRecord::TestCase
@@ -2585,3 +2592,54 @@ module ActiveRecord
     end
   end
 end
+
+module ActiveRecord
+  class Migration
+    class CheckConstraintTest < ActiveRecord::TestCase
+      # SQL Server formats the check constraint expression differently.
+      coerce_tests! :test_check_constraints
+      def test_check_constraints_coerced
+        check_constraints = @connection.check_constraints("products")
+        assert_equal 1, check_constraints.size
+
+        constraint = check_constraints.first
+        assert_equal "products", constraint.table_name
+        assert_equal "products_price_check", constraint.name
+        assert_equal "[price]>[discounted_price]", constraint.expression
+      end
+
+      # SQL Server formats the check constraint expression differently.
+      coerce_tests! :test_add_check_constraint
+      def test_add_check_constraint_coerced
+        @connection.add_check_constraint :trades, "quantity > 0"
+
+        check_constraints = @connection.check_constraints("trades")
+        assert_equal 1, check_constraints.size
+
+        constraint = check_constraints.first
+        assert_equal "trades", constraint.table_name
+        assert_equal "chk_rails_2189e9f96c", constraint.name
+        assert_equal "[quantity]>(0)", constraint.expression
+      end
+
+      # SQL Server formats the check constraint expression differently.
+      coerce_tests! :test_remove_check_constraint
+      def test_remove_check_constraint_coerced
+        @connection.add_check_constraint :trades, "price > 0", name: "price_check"
+        @connection.add_check_constraint :trades, "quantity > 0", name: "quantity_check"
+
+        assert_equal 2, @connection.check_constraints("trades").size
+        @connection.remove_check_constraint :trades, name: "quantity_check"
+        assert_equal 1, @connection.check_constraints("trades").size
+
+        constraint = @connection.check_constraints("trades").first
+        assert_equal "trades", constraint.table_name
+        assert_equal "price_check", constraint.name
+        assert_equal "[price]>(0)", constraint.expression
+
+        @connection.remove_check_constraint :trades, name: :price_check # name as a symbol
+        assert_empty @connection.check_constraints("trades")
+      end
+    end
+  end
+end

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
 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-21 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/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.1.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -248,9 +248,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.7
 signing_key: