RubyGems - activerecord - Versions diffs - 5.1.7 → 5.2.4.3 - Mend

activerecord 5.1.7 → 5.2.4.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of activerecord might be problematic. Click here for more details.

Files changed (261) hide show

data/lib/active_record/connection_adapters/mysql/type_metadata.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module MySQL

data/lib/active_record/connection_adapters/mysql2_adapter.rb CHANGED

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
 require "active_record/connection_adapters/abstract_mysql_adapter"
 require "active_record/connection_adapters/mysql/database_statements"
-gem "mysql2", ">= 0.3.18", "< 0.6.0"
+gem "mysql2", ">= 0.4.4", "< 0.6.0"
 require "mysql2"
-raise "mysql2 0.4.3 is not supported. Please upgrade to 0.4.4+" if Mysql2::VERSION == "0.4.3"
 module ActiveRecord
   module ConnectionHandling # :nodoc:
@@ -103,6 +104,11 @@ module ActiveRecord
         @connection.close
       end
+      def discard! # :nodoc:
+        @connection.automatic_close = false
+        @connection = nil
+      end
       private
         def connect

data/lib/active_record/connection_adapters/postgresql/column.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     # PostgreSQL-specific extensions to column definitions in a table.

data/lib/active_record/connection_adapters/postgresql/database_statements.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
@@ -147,6 +149,10 @@ module ActiveRecord
         end
         private
+          # Returns the current ID of a table's sequence.
+          def last_insert_id_result(sequence_name)
+            exec_query("SELECT currval(#{quote(sequence_name)})", "SQL")
+          end
           def suppress_composite_primary_key(pk)
             pk unless pk.is_a?(Array)

data/lib/active_record/connection_adapters/postgresql/explain_pretty_printer.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid.rb CHANGED

@@ -1,14 +1,16 @@
+# frozen_string_literal: true
 require "active_record/connection_adapters/postgresql/oid/array"
 require "active_record/connection_adapters/postgresql/oid/bit"
 require "active_record/connection_adapters/postgresql/oid/bit_varying"
 require "active_record/connection_adapters/postgresql/oid/bytea"
 require "active_record/connection_adapters/postgresql/oid/cidr"
+require "active_record/connection_adapters/postgresql/oid/date"
 require "active_record/connection_adapters/postgresql/oid/date_time"
 require "active_record/connection_adapters/postgresql/oid/decimal"
 require "active_record/connection_adapters/postgresql/oid/enum"
 require "active_record/connection_adapters/postgresql/oid/hstore"
 require "active_record/connection_adapters/postgresql/oid/inet"
-require "active_record/connection_adapters/postgresql/oid/json"
 require "active_record/connection_adapters/postgresql/oid/jsonb"
 require "active_record/connection_adapters/postgresql/oid/money"
 require "active_record/connection_adapters/postgresql/oid/oid"

data/lib/active_record/connection_adapters/postgresql/oid/array.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/bit.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/bit_varying.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/bytea.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/cidr.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 require "ipaddr"
 module ActiveRecord

data/lib/active_record/connection_adapters/postgresql/oid/date.rb ADDED

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+module ActiveRecord
+  module ConnectionAdapters
+    module PostgreSQL
+      module OID # :nodoc:
+        class Date < Type::Date # :nodoc:
+          def cast_value(value)
+            case value
+            when "infinity" then ::Float::INFINITY
+            when "-infinity" then -::Float::INFINITY
+            when / BC$/
+              astronomical_year = format("%04d", -value[/^\d+/].to_i + 1)
+              super(value.sub(/ BC$/, "").sub(/^\d+/, astronomical_year))
+            else
+              super
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/postgresql/oid/date_time.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/decimal.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/enum.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/hstore.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/inet.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/jsonb.rb CHANGED

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module OID # :nodoc:
-        class Jsonb < Json # :nodoc:
+        class Jsonb < Type::Json # :nodoc:
           def type
             :jsonb
           end

data/lib/active_record/connection_adapters/postgresql/oid/legacy_point.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/money.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
@@ -22,7 +24,7 @@ module ActiveRecord
             #  (3) -$2.55
             #  (4) ($2.55)
-            value.sub!(/^\((.+)\)$/, '-\1') # (4)
+            value = value.sub(/^\((.+)\)$/, '-\1') # (4)
             case value
             when /^-?\D+[\d,]+\.\d{2}$/  # (1)
               value.gsub!(/[^-\d.]/, "")

data/lib/active_record/connection_adapters/postgresql/oid/oid.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/point.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   Point = Struct.new(:x, :y)

data/lib/active_record/connection_adapters/postgresql/oid/range.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
@@ -33,7 +35,7 @@ module ActiveRecord
             if value.is_a?(::Range)
               from = type_cast_single_for_database(value.begin)
               to = type_cast_single_for_database(value.end)
-              "[#{from},#{to}#{value.exclude_end? ? ')' : ']'}"
+              ::Range.new(from, to, value.exclude_end?)
             else
               super
             end
@@ -62,7 +64,7 @@ module ActiveRecord
             end
             def type_cast_single_for_database(value)
-              infinity?(value) ? "" : @subtype.serialize(value)
+              infinity?(value) ? value : @subtype.serialize(value)
             end
             def extract_bounds(value)

data/lib/active_record/connection_adapters/postgresql/oid/specialized_string.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/type_map_initializer.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
@@ -29,8 +31,8 @@ module ActiveRecord
             composites.each { |row| register_composite_type(row) }
           end
-          def query_conditions_for_initial_load(type_map)
-            known_type_names = type_map.keys.map { |n| "'#{n}'" }
+          def query_conditions_for_initial_load
+            known_type_names = @store.keys.map { |n| "'#{n}'" }
             known_type_types = %w('r' 'e' 'd')
             <<-SQL % [known_type_names.join(", "), known_type_types.join(", ")]
               WHERE

data/lib/active_record/connection_adapters/postgresql/oid/uuid.rb CHANGED

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module OID # :nodoc:
         class Uuid < Type::Value # :nodoc:
-          ACCEPTABLE_UUID = %r{\A\{?([a-fA-F0-9]{4}-?){8}\}?\z}x
+          ACCEPTABLE_UUID = %r{\A(\{)?([a-fA-F0-9]{4}-?){8}(?(1)\}|)\z}
           alias_method :serialize, :deserialize

data/lib/active_record/connection_adapters/postgresql/oid/vector.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/oid/xml.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL

data/lib/active_record/connection_adapters/postgresql/quoting.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
@@ -99,6 +101,8 @@ module ActiveRecord
               end
             when OID::Array::Data
               _quote(encode_array(value))
+            when Range
+              _quote(encode_range(value))
             else
               super
             end
@@ -115,6 +119,8 @@ module ActiveRecord
               value.to_s
             when OID::Array::Data
               encode_array(value)
+            when Range
+              encode_range(value)
             else
               super
             end
@@ -131,6 +137,10 @@ module ActiveRecord
             result
           end
+          def encode_range(range)
+            "[#{type_cast_range_value(range.first)},#{type_cast_range_value(range.last)}#{range.exclude_end? ? ')' : ']'}"
+          end
           def determine_encoding_of_strings_in_array(value)
             case value
             when ::Array then determine_encoding_of_strings_in_array(value.first)
@@ -144,6 +154,14 @@ module ActiveRecord
             else _type_cast(values)
             end
           end
+          def type_cast_range_value(value)
+            infinity?(value) ? "" : type_cast(value)
+          end
+          def infinity?(value)
+            value.respond_to?(:infinite?) && value.infinite?
+          end
       end
     end
   end

data/lib/active_record/connection_adapters/postgresql/referential_integrity.rb CHANGED

@@ -1,27 +1,24 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       module ReferentialIntegrity # :nodoc:
-        def supports_disable_referential_integrity? # :nodoc:
-          true
-        end
         def disable_referential_integrity # :nodoc:
-          if supports_disable_referential_integrity?
-            original_exception = nil
+          original_exception = nil
-            begin
-              transaction(requires_new: true) do
-                execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
-              end
-            rescue ActiveRecord::ActiveRecordError => e
-              original_exception = e
+          begin
+            transaction(requires_new: true) do
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} DISABLE TRIGGER ALL" }.join(";"))
             end
+          rescue ActiveRecord::ActiveRecordError => e
+            original_exception = e
+          end
-            begin
-              yield
-            rescue ActiveRecord::InvalidForeignKey => e
-              warn <<-WARNING
+          begin
+            yield
+          rescue ActiveRecord::InvalidForeignKey => e
+            warn <<-WARNING
 WARNING: Rails was not able to disable referential integrity.
 This is most likely caused due to missing permissions.
@@ -30,17 +27,14 @@ Rails needs superuser privileges to disable referential integrity.
     cause: #{original_exception.try(:message)}
               WARNING
-              raise e
-            end
+            raise e
+          end
-            begin
-              transaction(requires_new: true) do
-                execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
-              end
-            rescue ActiveRecord::ActiveRecordError
+          begin
+            transaction(requires_new: true) do
+              execute(tables.collect { |name| "ALTER TABLE #{quote_table_name(name)} ENABLE TRIGGER ALL" }.join(";"))
             end
-          else
-            yield
+          rescue ActiveRecord::ActiveRecordError
           end
         end
       end

data/lib/active_record/connection_adapters/postgresql/schema_creation.rb CHANGED

@@ -1,8 +1,58 @@
+# frozen_string_literal: true
 module ActiveRecord
   module ConnectionAdapters
     module PostgreSQL
       class SchemaCreation < AbstractAdapter::SchemaCreation # :nodoc:
         private
+          def visit_AlterTable(o)
+            super << o.constraint_validations.map { |fk| visit_ValidateConstraint fk }.join(" ")
+          end
+          def visit_AddForeignKey(o)
+            super.dup.tap { |sql| sql << " NOT VALID" unless o.validate? }
+          end
+          def visit_ValidateConstraint(name)
+            "VALIDATE CONSTRAINT #{quote_column_name(name)}"
+          end
+          def visit_ChangeColumnDefinition(o)
+            column = o.column
+            column.sql_type = type_to_sql(column.type, column.options)
+            quoted_column_name = quote_column_name(o.name)
+            change_column_sql = "ALTER COLUMN #{quoted_column_name} TYPE #{column.sql_type}".dup
+            options = column_options(column)
+            if options[:collation]
+              change_column_sql << " COLLATE \"#{options[:collation]}\""
+            end
+            if options[:using]
+              change_column_sql << " USING #{options[:using]}"
+            elsif options[:cast_as]
+              cast_as_type = type_to_sql(options[:cast_as], options)
+              change_column_sql << " USING CAST(#{quoted_column_name} AS #{cast_as_type})"
+            end
+            if options.key?(:default)
+              if options[:default].nil?
+                change_column_sql << ", ALTER COLUMN #{quoted_column_name} DROP DEFAULT"
+              else
+                quoted_default = quote_default_expression(options[:default], column)
+                change_column_sql << ", ALTER COLUMN #{quoted_column_name} SET DEFAULT #{quoted_default}"
+              end
+            end
+            if options.key?(:null)
+              change_column_sql << ", ALTER COLUMN #{quoted_column_name} #{options[:null] ? 'DROP' : 'SET'} NOT NULL"
+            end
+            change_column_sql
+          end
           def add_column_options!(sql, options)
             if options[:collation]
               sql << " COLLATE \"#{options[:collation]}\""