Merge pull request #984 from yellowspot/better-handle-sql-queries

[Rails 7] Better handle sql queries

Author: aidanharan

CHANGELOG.md

@@ -7,6 +7,7 @@
 #### Changed
 
 - [#983](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/983) Optimize remove_columns to use a single SQL statement
+- [#984](https://github.com/rails-sqlserver/activerecord-sqlserver-adapter/pull/984) Better handle SQL queries with invalid encoding
 
 #### Added
 

lib/active_record/connection_adapters/sqlserver/database_statements.rb

@@ -9,6 +9,8 @@ module DatabaseStatements
 
         def write_query?(sql) # :nodoc:
           !READ_QUERY.match?(sql)
+        rescue ArgumentError # Invalid encoding
+          !READ_QUERY.match?(sql.b)
         end
 
         def execute(sql, name = nil)

test/cases/coerced_tests.rb

@@ -91,6 +91,18 @@ def test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_is_called
       Subscriber.send(:load_schema!)
       original_test_errors_when_an_insert_query_prefixed_by_a_double_dash_comment_is_called_while_preventing_writes
     end
+
+    coerce_tests! :test_doesnt_error_when_a_select_query_has_encoding_errors
+    def test_doesnt_error_when_a_select_query_has_encoding_errors_coerced
+      ActiveRecord::Base.while_preventing_writes do
+        # TinyTDS fail on encoding errors.
+        # But at least we can assert it fails in the client and not before when trying to
+        # match the query.
+        assert_raises ActiveRecord::StatementInvalid do
+          @connection.select_all("SELECT '\xC8'")
+        end
+      end
+    end
   end
 end