activerecord 7.1.5 → 7.2.0.beta1

data/lib/active_record/connection_adapters/schema_cache.rb

@@ -18,70 +18,62 @@ module ActiveRecord
         @cache_path = cache_path
       end
 
-      def set_schema_cache(cache)
-        @cache = cache
-      end
-
       def clear!
         @cache = empty_cache
 
         nil
       end
 
-      def load!(connection)
-        cache(connection)
+      def load!(pool)
+        cache(pool)
 
         self
       end
 
-      def primary_keys(connection, table_name)
-        cache(connection).primary_keys(connection, table_name)
+      def primary_keys(pool, table_name)
+        cache(pool).primary_keys(pool, table_name)
       end
 
-      def data_source_exists?(connection, name)
-        cache(connection).data_source_exists?(connection, name)
+      def data_source_exists?(pool, name)
+        cache(pool).data_source_exists?(pool, name)
       end
 
-      def add(connection, name)
-        cache(connection).add(connection, name)
+      def add(pool, name)
+        cache(pool).add(pool, name)
       end
 
-      def data_sources(connection, name)
-        cache(connection).data_sources(connection, name)
+      def data_sources(pool, name)
+        cache(pool).data_source_exists?(pool, name)
       end
 
-      def columns(connection, table_name)
-        cache(connection).columns(connection, table_name)
+      def columns(pool, table_name)
+        cache(pool).columns(pool, table_name)
       end
 
-      def columns_hash(connection, table_name)
-        cache(connection).columns_hash(connection, table_name)
+      def columns_hash(pool, table_name)
+        cache(pool).columns_hash(pool, table_name)
       end
 
-      def columns_hash?(connection, table_name)
-        cache(connection).columns_hash?(connection, table_name)
+      def columns_hash?(pool, table_name)
+        cache(pool).columns_hash?(pool, table_name)
       end
 
-      def indexes(connection, table_name)
-        cache(connection).indexes(connection, table_name)
+      def indexes(pool, table_name)
+        cache(pool).indexes(pool, table_name)
       end
 
-      def database_version(connection) # :nodoc:
-        cache(connection).database_version(connection)
+      def version(pool)
+        cache(pool).version(pool)
       end
 
-      def version(connection)
-        cache(connection).version(connection)
+      def size(pool)
+        cache(pool).size
       end
 
-      def size(connection)
-        cache(connection).size
-      end
-
-      def clear_data_source_cache!(connection, name)
+      def clear_data_source_cache!(pool, name)
         return if @cache.nil? && !possible_cache_available?
 
-        cache(connection).clear_data_source_cache!(connection, name)
+        cache(pool).clear_data_source_cache!(pool, name)
       end
 
       def cached?(table_name)
@@ -96,9 +88,9 @@ module ActiveRecord
         @cache&.cached?(table_name)
       end
 
-      def dump_to(connection, filename)
+      def dump_to(pool, filename)
         fresh_cache = empty_cache
-        fresh_cache.add_all(connection)
+        fresh_cache.add_all(pool)
         fresh_cache.dump_to(filename)
 
         @cache = fresh_cache
@@ -111,8 +103,8 @@ module ActiveRecord
           new_cache
         end
 
-        def cache(connection)
-          @cache ||= load_cache(connection) || empty_cache
+        def cache(pool)
+          @cache ||= load_cache(pool) || empty_cache
         end
 
         def possible_cache_available?
@@ -121,7 +113,7 @@ module ActiveRecord
             File.file?(@cache_path)
         end
 
-        def load_cache(connection)
+        def load_cache(pool)
           # Can't load if schema dumps are disabled
           return unless possible_cache_available?
 
@@ -130,11 +122,13 @@ module ActiveRecord
 
           if self.class.check_schema_cache_dump_version
             begin
-              current_version = connection.schema_version
+              pool.with_connection do |connection|
+                current_version = connection.schema_version
 
-              if new_cache.version(connection) != current_version
-                warn "Ignoring #{@cache_path} because it has expired. The current schema version is #{current_version}, but the one in the schema cache file is #{new_cache.schema_version}."
-                return
+                if new_cache.version(connection) != current_version
+                  warn "Ignoring #{@cache_path} because it has expired. The current schema version is #{current_version}, but the one in the schema cache file is #{new_cache.schema_version}."
+                  return
+                end
               end
             rescue ActiveRecordError => error
               warn "Failed to validate the schema cache because of #{error.class}: #{error.message}"
@@ -147,9 +141,25 @@ module ActiveRecord
     end
 
     class BoundSchemaReflection
-      def initialize(abstract_schema_reflection, connection)
+      class FakePool # :nodoc
+        def initialize(connection)
+          @connection = connection
+        end
+
+        def with_connection
+          yield @connection
+        end
+      end
+
+      class << self
+        def for_lone_connection(abstract_schema_reflection, connection) # :nodoc:
+          new(abstract_schema_reflection, FakePool.new(connection))
+        end
+      end
+
+      def initialize(abstract_schema_reflection, pool)
         @schema_reflection = abstract_schema_reflection
-        @connection = connection
+        @pool = pool
       end
 
       def clear!
@@ -157,7 +167,7 @@ module ActiveRecord
       end
 
       def load!
-        @schema_reflection.load!(@connection)
+        @schema_reflection.load!(@pool)
       end
 
       def cached?(table_name)
@@ -165,72 +175,56 @@ module ActiveRecord
       end
 
       def primary_keys(table_name)
-        @schema_reflection.primary_keys(@connection, table_name)
+        @schema_reflection.primary_keys(@pool, table_name)
       end
 
       def data_source_exists?(name)
-        @schema_reflection.data_source_exists?(@connection, name)
+        @schema_reflection.data_source_exists?(@pool, name)
       end
 
       def add(name)
-        @schema_reflection.add(@connection, name)
+        @schema_reflection.add(@pool, name)
       end
 
       def data_sources(name)
-        @schema_reflection.data_sources(@connection, name)
+        @schema_reflection.data_sources(@pool, name)
       end
 
       def columns(table_name)
-        @schema_reflection.columns(@connection, table_name)
+        @schema_reflection.columns(@pool, table_name)
       end
 
       def columns_hash(table_name)
-        @schema_reflection.columns_hash(@connection, table_name)
+        @schema_reflection.columns_hash(@pool, table_name)
       end
 
       def columns_hash?(table_name)
-        @schema_reflection.columns_hash?(@connection, table_name)
+        @schema_reflection.columns_hash?(@pool, table_name)
       end
 
       def indexes(table_name)
-        @schema_reflection.indexes(@connection, table_name)
-      end
-
-      def database_version # :nodoc:
-        @schema_reflection.database_version(@connection)
+        @schema_reflection.indexes(@pool, table_name)
       end
 
       def version
-        @schema_reflection.version(@connection)
+        @schema_reflection.version(@pool)
       end
 
       def size
-        @schema_reflection.size(@connection)
+        @schema_reflection.size(@pool)
       end
 
       def clear_data_source_cache!(name)
-        @schema_reflection.clear_data_source_cache!(@connection, name)
+        @schema_reflection.clear_data_source_cache!(@pool, name)
       end
 
       def dump_to(filename)
-        @schema_reflection.dump_to(@connection, filename)
+        @schema_reflection.dump_to(@pool, filename)
       end
     end
 
     # = Active Record Connection Adapters Schema Cache
     class SchemaCache
-      class << self
-        def new(connection)
-          BoundSchemaReflection.new(SchemaReflection.new(nil), connection)
-        end
-        deprecate new: "use ActiveRecord::ConnectionAdapters::SchemaReflection instead", deprecator: ActiveRecord.deprecator
-
-        def load_from(filename) # :nodoc:
-          BoundSchemaReflection.new(SchemaReflection.new(filename), nil)
-        end
-        deprecate load_from: "use ActiveRecord::ConnectionAdapters::SchemaReflection instead", deprecator: ActiveRecord.deprecator
-      end
-
       def self._load_from(filename) # :nodoc:
         return unless File.file?(filename)
 
@@ -258,13 +252,12 @@ module ActiveRecord
       end
       private_class_method :read
 
-      def initialize
+      def initialize # :nodoc:
         @columns      = {}
         @columns_hash = {}
         @primary_keys = {}
         @data_sources = {}
         @indexes      = {}
-        @database_version = nil
         @version = nil
       end
 
@@ -283,17 +276,15 @@ module ActiveRecord
         coder["data_sources"]     = @data_sources.sort.to_h
         coder["indexes"]          = @indexes.sort.to_h
         coder["version"]          = @version
-        coder["database_version"] = @database_version
       end
 
-      def init_with(coder)
+      def init_with(coder) # :nodoc:
         @columns          = coder["columns"]
         @columns_hash     = coder["columns_hash"]
         @primary_keys     = coder["primary_keys"]
         @data_sources     = coder["data_sources"]
         @indexes          = coder["indexes"] || {}
         @version          = coder["version"]
-        @database_version = coder["database_version"]
 
         unless coder["deduplicated"]
           derive_columns_hash_and_deduplicate_values
@@ -304,78 +295,85 @@ module ActiveRecord
         @columns.key?(table_name)
       end
 
-      def primary_keys(connection, table_name)
+      def primary_keys(pool, table_name)
         @primary_keys.fetch(table_name) do
-          if data_source_exists?(connection, table_name)
-            @primary_keys[deep_deduplicate(table_name)] = deep_deduplicate(connection.primary_key(table_name))
+          pool.with_connection do |connection|
+            if data_source_exists?(pool, table_name)
+              @primary_keys[deep_deduplicate(table_name)] = deep_deduplicate(connection.primary_key(table_name))
+            end
           end
         end
       end
 
       # A cached lookup for table existence.
-      def data_source_exists?(connection, name)
+      def data_source_exists?(pool, name)
         return if ignored_table?(name)
-        prepare_data_sources(connection) if @data_sources.empty?
+
+        if @data_sources.empty?
+          tables_to_cache(pool).each do |source|
+            @data_sources[source] = true
+          end
+        end
+
         return @data_sources[name] if @data_sources.key? name
 
-        @data_sources[deep_deduplicate(name)] = connection.data_source_exists?(name)
+        @data_sources[deep_deduplicate(name)] = pool.with_connection do |connection|
+          connection.data_source_exists?(name)
+        end
       end
 
       # Add internal cache for table with +table_name+.
-      def add(connection, table_name)
-        if data_source_exists?(connection, table_name)
-          primary_keys(connection, table_name)
-          columns(connection, table_name)
-          columns_hash(connection, table_name)
-          indexes(connection, table_name)
+      def add(pool, table_name)
+        pool.with_connection do
+          if data_source_exists?(pool, table_name)
+            primary_keys(pool, table_name)
+            columns(pool, table_name)
+            columns_hash(pool, table_name)
+            indexes(pool, table_name)
+          end
         end
       end
 
-      def data_sources(_connection, name) # :nodoc:
-        @data_sources[name]
-      end
-      deprecate data_sources: :data_source_exists?, deprecator: ActiveRecord.deprecator
-
       # Get the columns for a table
-      def columns(connection, table_name)
+      def columns(pool, table_name)
         if ignored_table?(table_name)
-          raise ActiveRecord::StatementInvalid, "Table '#{table_name}' doesn't exist"
+          raise ActiveRecord::StatementInvalid.new("Table '#{table_name}' doesn't exist", connection_pool: pool)
         end
 
         @columns.fetch(table_name) do
-          @columns[deep_deduplicate(table_name)] = deep_deduplicate(connection.columns(table_name))
+          pool.with_connection do |connection|
+            @columns[deep_deduplicate(table_name)] = deep_deduplicate(connection.columns(table_name))
+          end
         end
       end
 
       # Get the columns for a table as a hash, key is the column name
       # value is the column object.
-      def columns_hash(connection, table_name)
+      def columns_hash(pool, table_name)
         @columns_hash.fetch(table_name) do
-          @columns_hash[deep_deduplicate(table_name)] = columns(connection, table_name).index_by(&:name).freeze
+          @columns_hash[deep_deduplicate(table_name)] = columns(pool, table_name).index_by(&:name).freeze
         end
       end
 
       # Checks whether the columns hash is already cached for a table.
-      def columns_hash?(connection, table_name)
+      def columns_hash?(_pool, table_name)
         @columns_hash.key?(table_name)
       end
 
-      def indexes(connection, table_name)
+      def indexes(pool, table_name)
         @indexes.fetch(table_name) do
-          if data_source_exists?(connection, table_name)
-            @indexes[deep_deduplicate(table_name)] = deep_deduplicate(connection.indexes(table_name))
-          else
-            []
+          pool.with_connection do |connection|
+            if data_source_exists?(pool, table_name)
+              @indexes[deep_deduplicate(table_name)] = deep_deduplicate(connection.indexes(table_name))
+            else
+              []
+            end
           end
         end
       end
 
-      def database_version(connection) # :nodoc:
-        @database_version ||= connection.get_database_version
-      end
-
-      def version(connection)
-        @version ||= connection.schema_version
+      def version(pool)
+        @version ||= pool.with_connection(&:schema_version)
       end
 
       def schema_version
@@ -395,13 +393,14 @@ module ActiveRecord
         @indexes.delete name
       end
 
-      def add_all(connection) # :nodoc:
-        tables_to_cache(connection).each do |table|
-          add(connection, table)
-        end
+      def add_all(pool) # :nodoc:
+        pool.with_connection do
+          tables_to_cache(pool).each do |table|
+            add(pool, table)
+          end
 
-        version(connection)
-        database_version(connection)
+          version(pool)
+        end
       end
 
       def dump_to(filename)
@@ -415,20 +414,22 @@ module ActiveRecord
       end
 
       def marshal_dump # :nodoc:
-        [@version, @columns, {}, @primary_keys, @data_sources, @indexes, @database_version]
+        [@version, @columns, {}, @primary_keys, @data_sources, @indexes]
       end
 
       def marshal_load(array) # :nodoc:
-        @version, @columns, _columns_hash, @primary_keys, @data_sources, @indexes, @database_version = array
+        @version, @columns, _columns_hash, @primary_keys, @data_sources, @indexes, _database_version = array
         @indexes ||= {}
 
         derive_columns_hash_and_deduplicate_values
       end
 
       private
-        def tables_to_cache(connection)
-          connection.data_sources.reject do |table|
-            ignored_table?(table)
+        def tables_to_cache(pool)
+          pool.with_connection do |connection|
+            connection.data_sources.reject do |table|
+              ignored_table?(table)
+            end
           end
         end
 
@@ -459,12 +460,6 @@ module ActiveRecord
           end
         end
 
-        def prepare_data_sources(connection)
-          tables_to_cache(connection).each do |source|
-            @data_sources[source] = true
-          end
-        end
-
         def open(filename)
           FileUtils.mkdir_p(File.dirname(filename))
 

data/lib/active_record/connection_adapters/sqlite3/column.rb

@@ -6,10 +6,11 @@ module ActiveRecord
       class Column < ConnectionAdapters::Column # :nodoc:
         attr_reader :rowid
 
-        def initialize(*, auto_increment: nil, rowid: false, **)
+        def initialize(*, auto_increment: nil, rowid: false, generated_type: nil, **)
           super
           @auto_increment = auto_increment
           @rowid = rowid
+          @generated_type = generated_type
         end
 
         def auto_increment?
@@ -20,6 +21,18 @@ module ActiveRecord
           auto_increment? || rowid
         end
 
+        def virtual?
+          !@generated_type.nil?
+        end
+
+        def virtual_stored?
+          virtual? && @generated_type == :stored
+        end
+
+        def has_default?
+          super && !virtual?
+        end
+
         def init_with(coder)
           @auto_increment = coder["auto_increment"]
           super

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

@@ -21,7 +21,7 @@ module ActiveRecord
           SQLite3::ExplainPrettyPrinter.new.pp(result)
         end
 
-        def internal_exec_query(sql, name = nil, binds = [], prepare: false, async: false) # :nodoc:
+        def internal_exec_query(sql, name = nil, binds = [], prepare: false, async: false, allow_retry: false) # :nodoc:
           sql = transform_query(sql)
           check_if_write_query(sql)
 
@@ -29,7 +29,7 @@ module ActiveRecord
 
           type_casted_binds = type_casted_binds(binds)
 
-          log(sql, name, binds, type_casted_binds, async: async) do
+          log(sql, name, binds, type_casted_binds, async: async) do |notification_payload|
             with_raw_connection do |conn|
               # Don't cache statements if they are not prepared
               unless prepare
@@ -52,7 +52,9 @@ module ActiveRecord
               end
               verified!
 
-              build_result(columns: cols, rows: records)
+              result = build_result(columns: cols, rows: records)
+              notification_payload[:row_count] = result.length
+              result
             end
           end
         end
@@ -104,7 +106,7 @@ module ActiveRecord
 
         # https://stackoverflow.com/questions/17574784
         # https://www.sqlite.org/lang_datefunc.html
-        HIGH_PRECISION_CURRENT_TIMESTAMP = Arel.sql("STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')").freeze # :nodoc:
+        HIGH_PRECISION_CURRENT_TIMESTAMP = Arel.sql("STRFTIME('%Y-%m-%d %H:%M:%f', 'NOW')", retryable: true).freeze # :nodoc:
         private_constant :HIGH_PRECISION_CURRENT_TIMESTAMP
 
         def high_precision_current_timestamp
@@ -113,10 +115,11 @@ module ActiveRecord
 
         private
           def raw_execute(sql, name, async: false, allow_retry: false, materialize_transactions: false)
-            log(sql, name, async: async) do
+            log(sql, name, async: async) do |notification_payload|
               with_raw_connection(allow_retry: allow_retry, materialize_transactions: materialize_transactions) do |conn|
                 result = conn.execute(sql)
                 verified!
+                notification_payload[:row_count] = result.length
                 result
               end
             end
@@ -136,10 +139,11 @@ module ActiveRecord
             check_if_write_query(sql)
             mark_transaction_written_if_write(sql)
 
-            log(sql, name) do
+            log(sql, name) do |notification_payload|
               with_raw_connection do |conn|
                 result = conn.execute_batch2(sql)
                 verified!
+                notification_payload[:row_count] = result.length
                 result
               end
             end

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

@@ -4,9 +4,52 @@ module ActiveRecord
   module ConnectionAdapters
     module SQLite3
       module Quoting # :nodoc:
+        extend ActiveSupport::Concern
+
         QUOTED_COLUMN_NAMES = Concurrent::Map.new # :nodoc:
         QUOTED_TABLE_NAMES = Concurrent::Map.new # :nodoc:
 
+        module ClassMethods # :nodoc:
+          def column_name_matcher
+            /
+              \A
+              (
+                (?:
+                  # "table_name"."column_name" | function(one or no argument)
+                  ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
+                )
+                (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
+              )
+              (?:\s*,\s*\g<1>)*
+              \z
+            /ix
+          end
+
+          def column_name_with_order_matcher
+            /
+              \A
+              (
+                (?:
+                  # "table_name"."column_name" | function(one or no argument)
+                  ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
+                )
+                (?:\s+COLLATE\s+(?:\w+|"\w+"))?
+                (?:\s+ASC|\s+DESC)?
+              )
+              (?:\s*,\s*\g<1>)*
+              \z
+            /ix
+          end
+
+          def quote_column_name(name)
+            QUOTED_COLUMN_NAMES[name] ||= %Q("#{name.to_s.gsub('"', '""')}").freeze
+          end
+
+          def quote_table_name(name)
+            QUOTED_TABLE_NAMES[name] ||= %Q("#{name.to_s.gsub('"', '""').gsub(".", "\".\"")}").freeze
+          end
+        end
+
         def quote_string(s)
           ::SQLite3::Database.quote(s)
         end
@@ -15,14 +58,6 @@ module ActiveRecord
           quote_column_name(attr)
         end
 
-        def quote_table_name(name)
-          QUOTED_TABLE_NAMES[name] ||= super.gsub(".", "\".\"").freeze
-        end
-
-        def quote_column_name(name)
-          QUOTED_COLUMN_NAMES[name] ||= %Q("#{super.gsub('"', '""')}")
-        end
-
         def quoted_time(value)
           value = value.change(year: 2000, month: 1, day: 1)
           quoted_date(value).sub(/\A\d\d\d\d-\d\d-\d\d /, "2000-01-01 ")
@@ -63,7 +98,7 @@ module ActiveRecord
 
         def type_cast(value) # :nodoc:
           case value
-          when BigDecimal
+          when BigDecimal, Rational
             value.to_f
           when String
             if value.encoding == Encoding::ASCII_8BIT
@@ -75,43 +110,6 @@ module ActiveRecord
             super
           end
         end
-
-        def column_name_matcher
-          COLUMN_NAME
-        end
-
-        def column_name_with_order_matcher
-          COLUMN_NAME_WITH_ORDER
-        end
-
-        COLUMN_NAME = /
-          \A
-          (
-            (?:
-              # "table_name"."column_name" | function(one or no argument)
-              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
-            )
-            (?:(?:\s+AS)?\s+(?:\w+|"\w+"))?
-          )
-          (?:\s*,\s*\g<1>)*
-          \z
-        /ix
-
-        COLUMN_NAME_WITH_ORDER = /
-          \A
-          (
-            (?:
-              # "table_name"."column_name" | function(one or no argument)
-              ((?:\w+\.|"\w+"\.)?(?:\w+|"\w+") | \w+\((?:|\g<2>)\))
-            )
-            (?:\s+COLLATE\s+(?:\w+|"\w+"))?
-            (?:\s+ASC|\s+DESC)?
-          )
-          (?:\s*,\s*\g<1>)*
-          \z
-        /ix
-
-        private_constant :COLUMN_NAME, :COLUMN_NAME_WITH_ORDER
       end
     end
   end