activerecord 5.0.7 → 5.1.7

data/lib/active_record/connection_adapters/schema_cache.rb

@@ -21,6 +21,22 @@ module ActiveRecord
         @data_sources = @data_sources.dup
       end
 
+      def encode_with(coder)
+        coder["columns"] = @columns
+        coder["columns_hash"] = @columns_hash
+        coder["primary_keys"] = @primary_keys
+        coder["data_sources"] = @data_sources
+        coder["version"] = ActiveRecord::Migrator.current_version
+      end
+
+      def init_with(coder)
+        @columns = coder["columns"]
+        @columns_hash = coder["columns_hash"]
+        @primary_keys = coder["primary_keys"]
+        @data_sources = coder["data_sources"]
+        @version = coder["version"]
+      end
+
       def primary_keys(table_name)
         @primary_keys[table_name] ||= data_source_exists?(table_name) ? connection.primary_key(table_name) : nil
       end
@@ -32,9 +48,6 @@ module ActiveRecord
 
         @data_sources[name] = connection.data_source_exists?(name)
       end
-      alias table_exists? data_source_exists?
-      deprecate :table_exists? => "use #data_source_exists? instead"
-
 
       # Add internal cache for table with +table_name+.
       def add(table_name)
@@ -48,8 +61,6 @@ module ActiveRecord
       def data_sources(name)
         @data_sources[name]
       end
-      alias tables data_sources
-      deprecate :tables => "use #data_sources instead"
 
       # Get the columns for a table
       def columns(table_name)
@@ -84,8 +95,6 @@ module ActiveRecord
         @primary_keys.delete name
         @data_sources.delete name
       end
-      alias clear_table_cache! clear_data_source_cache!
-      deprecate :clear_table_cache! => "use #clear_data_source_cache! instead"
 
       def marshal_dump
         # if we get current version during initialization, it happens stack over flow.

data/lib/active_record/connection_adapters/sql_type_metadata.rb

@@ -24,9 +24,9 @@ module ActiveRecord
 
       protected
 
-      def attributes_for_hash
-        [self.class, sql_type, type, limit, precision, scale]
-      end
+        def attributes_for_hash
+          [self.class, sql_type, type, limit, precision, scale]
+        end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module ActiveRecord
         #
         def pp(result)
           result.rows.map do |row|
-            row.join('|')
+            row.join("|")
           end.join("\n") + "\n"
         end
       end

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

@@ -11,37 +11,34 @@ module ActiveRecord
         end
 
         def quote_column_name(name)
-          @quoted_column_names[name] ||= %Q("#{super.gsub('"', '""')}")
+          @quoted_column_names[name] ||= %Q("#{super.gsub('"', '""')}").freeze
         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 ")
         end
 
-        private
-
-        def _quote(value)
-          if value.is_a?(Type::Binary::Data)
-            "x'#{value.hex}'"
-          else
-            super
-          end
+        def quoted_binary(value)
+          "x'#{value.hex}'"
         end
 
-        def _type_cast(value)
-          case value
-          when BigDecimal
-            value.to_f
-          when String
-            if value.encoding == Encoding::ASCII_8BIT
-              super(value.encode(Encoding::UTF_8))
+        private
+
+          def _type_cast(value)
+            case value
+            when BigDecimal
+              value.to_f
+            when String
+              if value.encoding == Encoding::ASCII_8BIT
+                super(value.encode(Encoding::UTF_8))
+              else
+                super
+              end
             else
               super
             end
-          else
-            super
           end
-        end
       end
     end
   end

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

@@ -1,15 +1,8 @@
 module ActiveRecord
   module ConnectionAdapters
     module SQLite3
-      class SchemaCreation < AbstractAdapter::SchemaCreation
+      class SchemaCreation < AbstractAdapter::SchemaCreation # :nodoc:
         private
-
-          def column_options(o)
-            options = super
-            options[:null] = false if o.primary_key
-            options
-          end
-
           def add_column_options!(sql, options)
             if options[:collation]
               sql << " COLLATE \"#{options[:collation]}\""

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

@@ -0,0 +1,28 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLite3
+      module ColumnMethods
+        def primary_key(name, type = :primary_key, **options)
+          if %i(integer bigint).include?(type) && (options.delete(:auto_increment) == true || !options.key?(:default))
+            type = :primary_key
+          end
+
+          super
+        end
+      end
+
+      class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
+        include ColumnMethods
+
+        def references(*args, **options)
+          super(*args, type: :integer, **options)
+        end
+        alias :belongs_to :references
+      end
+
+      class Table < ActiveRecord::ConnectionAdapters::Table
+        include ColumnMethods
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLite3
+      module ColumnDumper # :nodoc:
+        private
+
+          def default_primary_key?(column)
+            schema_type(column) == :integer
+          end
+
+          def explicit_primary_key_default?(column)
+            column.bigint?
+          end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,32 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module SQLite3
+      module SchemaStatements # :nodoc:
+        private
+          def data_source_sql(name = nil, type: nil)
+            scope = quoted_scope(name, type: type)
+            scope[:type] ||= "'table','view'"
+
+            sql = "SELECT name FROM sqlite_master WHERE name <> 'sqlite_sequence'"
+            sql << " AND name = #{scope[:name]}" if scope[:name]
+            sql << " AND type IN (#{scope[:type]})"
+            sql
+          end
+
+          def quoted_scope(name = nil, type: nil)
+            type = \
+              case type
+              when "BASE TABLE"
+                "'table'"
+              when "VIEW"
+                "'view'"
+              end
+            scope = {}
+            scope[:name] = quote(name) if name
+            scope[:type] = type if type
+            scope
+          end
+      end
+    end
+  end
+end