activerecord-sqlserver-adapter 7.0.4.0 → 7.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41b4642838dbc7178a170c4b002937e5481bf0c7154446d43cff2dae7800a938
-  data.tar.gz: fa20040c55e79a8417ec58c414b5ad6617acaa2fe808c5b48fc44c6e3187c5d7
+  metadata.gz: 02401b4f2142fc0cdebfd2308b94647ab6dc927c77542d4125dae6b6184e7e1c
+  data.tar.gz: c4d0d77af6f8344846387c14b1b84977b5af321bc7b2e9cf208bdab59179363d
 SHA512:
-  metadata.gz: b7786aeaaf3f90af8a69208e76901c1263e20ef1c4f410948319108531e128ff2d5247838efb10cbcda0fe6b035d1b130576647824e027a668b0fc3df1988305
-  data.tar.gz: 3d9db5b28f4b8b8468b71049b14b7000e25c7aa7afcac55f6fec0ec234f0e4cdf76c4158069328da464ad0a718f45ee9b45b2b6f19f00fc058b7d4ab87071308
+  metadata.gz: e37d3daf2d7a509ef38eb45218fc3db5d4c60938ac2b8687a7f53a5e516df6fa3fa29dea71914d469336ebb8a7020921f5b479917afe78654d05048b51dd3911
+  data.tar.gz: 91a4c0bb6729b16736885cc7b2a89e7a80abbb11580bc02b31bb83dc4c3e2b72eb2e10815ae85af7e5a28f9990a8e7bea102345d146fa8323593605a32ec2bda

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## v7.0.5.1
+
+#### Fixed
+
+- [#1133](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1133) Fix matching view's real column name
+
+## v7.0.5.0
+
+#### Fixed
+
+- [#1113](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1113) Fix issue with default view value not being found because of case sensitivity
+- [#1126](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/1113) Fix view issue with default column value not found
+
 ## v7.0.4.0
 
 #### Changed

data/README.md

@@ -13,7 +13,7 @@ Interested in older versions? We follow a rational versioning policy that tracks
 
 | Adapter Version | Rails Version | Support                                                                                     |
 |-----------------| ------------- | ------------------------------------------------------------------------------------------- |
-| `7.0.4.0`       | `7.0.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)   |
+| `7.0.5.1`       | `7.0.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/main)   |
 | `6.1.2.1`       | `6.1.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-1-stable) |
 | `6.0.3`         | `6.0.x`       | [active](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/6-0-stable) |
 | `5.2.1`         | `5.2.x`       | [ended](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/5-2-stable) |

data/VERSION

@@ -1 +1 @@
-7.0.4.0
+7.0.5.1

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

@@ -388,7 +388,7 @@ module ActiveRecord
 
           if view_exists
             results = sp_executesql %{
-              SELECT c.COLUMN_NAME AS [name], c.COLUMN_DEFAULT AS [default]
+              SELECT LOWER(c.COLUMN_NAME) AS [name], c.COLUMN_DEFAULT AS [default]
               FROM #{database}.INFORMATION_SCHEMA.COLUMNS c
               WHERE c.TABLE_NAME = #{quote(view_tblnm)}
             }.squish, "SCHEMA", []
@@ -426,7 +426,7 @@ module ActiveRecord
             ci[:default_function] = begin
               default = ci[:default_value]
               if default.nil? && view_exists
-                view_column = views_real_column_name(table_name, ci[:name])
+                view_column = views_real_column_name(table_name, ci[:name]).downcase
                 default = default_functions[view_column] if view_column.present?
               end
               case default
@@ -601,17 +601,19 @@ module ActiveRecord
             identifier = SQLServer::Utils.extract_identifiers(table_name)
             information_query_table = identifier.database.present? ? "[#{identifier.database}].[INFORMATION_SCHEMA].[VIEWS]" :  "[INFORMATION_SCHEMA].[VIEWS]"
             view_info = select_one "SELECT * FROM #{information_query_table} WITH (NOLOCK) WHERE TABLE_NAME = #{quote(identifier.object)}", "SCHEMA"
+
             if view_info
               view_info = view_info.with_indifferent_access
               if view_info[:VIEW_DEFINITION].blank? || view_info[:VIEW_DEFINITION].length == 4000
                 view_info[:VIEW_DEFINITION] = begin
-                  select_values("EXEC sp_helptext #{identifier.object_quoted}", "SCHEMA").join
+                                                select_values("EXEC sp_helptext #{identifier.object_quoted}", "SCHEMA").join
                                               rescue
                                                 warn "No view definition found, possible permissions problem.\nPlease run GRANT VIEW DEFINITION TO your_user;"
                                                 nil
-                end
+                                              end
               end
             end
+
             view_info
           end
         end
@@ -620,7 +622,8 @@ module ActiveRecord
           view_definition = view_information(table_name)[:VIEW_DEFINITION]
           return column_name unless view_definition
 
-          match_data = view_definition.match(/([\w-]*)\s+as\s+#{column_name}/im)
+          # Remove "CREATE VIEW ... AS SELECT ..." and then match the column name.
+          match_data = view_definition.sub(/CREATE\s+VIEW.*AS\s+SELECT\s/, '').match(/([\w-]*)\s+AS\s+#{column_name}\W/im)
           match_data ? match_data[1] : column_name
         end
 

data/test/cases/view_test_sqlserver.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+require "cases/helper_sqlserver"
+
+class ViewTestSQLServer < ActiveRecord::TestCase
+  let(:connection) { ActiveRecord::Base.connection }
+
+  describe 'view with default values' do
+    before do
+      connection.drop_table :view_casing_table rescue nil
+      connection.create_table :view_casing_table, force: true do |t|
+        t.boolean :Default_Falsey,      null: false, default: false
+        t.boolean :Default_Truthy,      null: false, default: true
+        t.string  :default_string_null, null: true,  default: nil
+        t.string  :default_string,      null: false, default: "abc"
+      end
+
+      connection.execute("DROP VIEW IF EXISTS view_casing_table_view;")
+      connection.execute <<-SQL
+        CREATE VIEW view_casing_table_view AS
+              SELECT id AS id,
+                     default_falsey      AS falsey,
+                     default_truthy      AS truthy,
+                     default_string_null AS s_null,
+                     default_string      AS s
+              FROM view_casing_table
+      SQL
+    end
+
+    it "default values are correct when column casing used in tables and views are different" do
+      klass = Class.new(ActiveRecord::Base) do
+        self.table_name = "view_casing_table_view"
+      end
+
+      obj = klass.new
+      assert_equal false, obj.falsey
+      assert_equal true, obj.truthy
+      assert_equal "abc", obj.s
+      assert_nil   obj.s_null
+      assert_equal 0, klass.count
+
+      obj.save!
+      assert_equal false, obj.falsey
+      assert_equal true, obj.truthy
+      assert_equal "abc", obj.s
+      assert_nil   obj.s_null
+      assert_equal 1, klass.count
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-sqlserver-adapter
 version: !ruby/object:Gem::Version
-  version: 7.0.4.0
+  version: 7.0.5.1
 platform: ruby
 authors:
 - Ken Collins
@@ -12,10 +12,10 @@ authors:
 - Joe Rafaniello
 - Tom Ward
 - Aidan Haran
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-19 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -177,6 +177,7 @@ files:
 - test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
+- test/cases/view_test_sqlserver.rb
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif
@@ -230,9 +231,9 @@ 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.4.0/CHANGELOG.md
-  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.4.0
-post_install_message: 
+  changelog_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/blob/v7.0.5.1/CHANGELOG.md
+  source_code_uri: https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/tree/v7.0.5.1
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -247,8 +248,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.4.7
+signing_key:
 specification_version: 4
 summary: ActiveRecord SQL Server Adapter.
 test_files:
@@ -291,6 +292,7 @@ test_files:
 - test/cases/trigger_test_sqlserver.rb
 - test/cases/utils_test_sqlserver.rb
 - test/cases/uuid_test_sqlserver.rb
+- test/cases/view_test_sqlserver.rb
 - test/config.yml
 - test/debug.rb
 - test/fixtures/1px.gif