update specific sql + precise delegation to model (see rails fd5bd98)

Author: BuonOmo

lib/active_record/relation/query_methods_ext.rb

@@ -57,7 +57,7 @@ def force_index(index_name, direction: nil)
       def force_index!(index_name, direction: nil)
         return self unless from_clause_is_a_table_name?
 
-        index_name = sanitize_sql(index_name.to_s)
+        index_name = model.sanitize_sql(index_name.to_s)
         direction = direction.to_s.upcase
         direction = %w[ASC DESC].include?(direction) ? ",#{direction}" : ""
 
@@ -84,7 +84,7 @@ def index_hint(hint)
       def index_hint!(hint)
         return self unless from_clause_is_a_table_name?
 
-        hint = sanitize_sql(hint.to_s)
+        hint = model.sanitize_sql(hint.to_s)
         @index_hint = hint.to_s
         self.from_clause = build_from_clause_with_hints
         self
@@ -120,7 +120,7 @@ def build_from_clause_with_hints
 
         table_name =
           if from_clause.empty?
-            quoted_table_name
+            model.quoted_table_name
           else
             # Remove previous table hints if any. And spaces.
             from_clause.value.partition("@").first.strip

test/excludes/ActiveRecord/ConnectionAdapters/PostgreSQLAdapterTest.rb

@@ -35,3 +35,6 @@
 exclude :test_translate_no_connection_exception_to_not_established, "CRDB doesn't implement pg_terminate_backend()"
 
 exclude :test_disable_extension_without_schema, ExcludeMessage::NO_HSTORE
+exclude :test_extensions_omits_current_schema_name, ExcludeMessage::NO_HSTORE
+exclude :test_extensions_includes_non_current_schema_name, ExcludeMessage::NO_HSTORE
+exclude :test_disable_extension_with_schema, ExcludeMessage::NO_HSTORE

test/excludes/ActiveRecord/ConnectionAdapters/RegistrationIsolatedTest.rb

@@ -0,0 +1,14 @@
+exclude "test_#resolve_raises_if_the_adapter_is_using_the_pre_7.2_adapter_registration_API", "One adapter is missing in the test, added below"
+
+test "#resolve raises if the adapter is using the pre 7.2 adapter registration API with CRDB" do
+  exception = assert_raises(ActiveRecord::AdapterNotFound) do
+    ActiveRecord::ConnectionAdapters.resolve("fake_legacy")
+  end
+
+  assert_equal(
+    "Database configuration specifies nonexistent 'fake_legacy' adapter. Available adapters are: abstract, cockroachdb, fake, mysql2, postgresql, sqlite3, trilogy. Ensure that the adapter is spelled correctly in config/database.yml and that you've added the necessary adapter gem to your Gemfile if it's not in the list of available adapters.",
+    exception.message
+  )
+ensure
+  ActiveRecord::ConnectionAdapters.instance_variable_get(:@adapters).delete("fake_legacy")
+end

test/schema/cockroachdb_specific_schema.rb

@@ -5,8 +5,8 @@
 # with an explanation of why they don't work.
 
 ActiveRecord::Schema.define do
-  ActiveRecord::TestCase.enable_extension!("uuid-ossp", ActiveRecord::Base.lease_connection)
-  ActiveRecord::TestCase.enable_extension!("pgcrypto",  ActiveRecord::Base.lease_connection) if ActiveRecord::Base.lease_connection.supports_pgcrypto_uuid?
+  ActiveRecord::TestCase.enable_extension!("uuid-ossp", connection)
+  ActiveRecord::TestCase.enable_extension!("pgcrypto",  connection) if connection.supports_pgcrypto_uuid?
 
   uuid_default = connection.supports_pgcrypto_uuid? ? {} : { default: "uuid_generate_v4()" }
 
@@ -45,6 +45,7 @@
     t.string :char2, limit: 50, default: "a varchar field"
     t.text :char3, default: "a text field"
     t.bigint :bigint_default, default: -> { "0::bigint" }
+    t.binary :binary_default_function, default: -> { "convert_to('A', 'UTF8')" }
     t.text :multiline_default, default: "--- []
 
 "
@@ -177,11 +178,13 @@
     t.integer :position_1
     t.integer :position_2
     t.integer :position_3
+    t.integer :position_4
 
-    # CockroachDB does not support deferrable, hence these three lines have been simplified.
+    # CockroachDB does not support deferrable, hence these four lines have been simplified.
     t.unique_constraint :position_1, name: "test_unique_constraints_position_1"
     t.unique_constraint :position_2, name: "test_unique_constraints_position_2"
     t.unique_constraint :position_3, name: "test_unique_constraints_position_3"
+    t.unique_constraint :position_4, name: "test_unique_constraints_position_4"
   end
 
   if supports_partitioned_indexes?
@@ -200,6 +203,9 @@
 
   add_index(:companies, [:firm_id, :type], name: "company_include_index", include: [:name, :account_id])
 
+  # In the original PostgreSQL schema, there would be a table here, populated using triggers.
+  # This is not supported by Cockroachdb so we removed that bit.
+
   create_table :buildings, force: true do |t|
     t.st_point :coordinates, srid: 3857
     t.st_point :latlon, srid: 4326, geographic: true