activerecord 4.2.0.beta1 → 4.2.0.beta2

data/lib/active_record/connection_adapters/abstract/connection_pool.rb

@@ -640,7 +640,7 @@ module ActiveRecord
       end
 
       def call(env)
-        testing = env.key?('rack.test')
+        testing = env['rack.test']
 
         response = @app.call(env)
         response[2] = ::Rack::BodyProxy.new(response[2]) do

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

@@ -83,6 +83,11 @@ module ActiveRecord
         exec_query(sql, name, binds)
       end
 
+      # Executes the truncate statement.
+      def truncate(table_name, name = nil)
+        raise NotImplementedError
+      end
+
       # Executes update +sql+ statement in the context of this connection using
       # +binds+ as the bind substitutes. +name+ is logged along with
       # the executed +sql+ statement.

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

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/string/strip'
+
 module ActiveRecord
   module ConnectionAdapters
     class AbstractAdapter

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

@@ -2,7 +2,6 @@ require 'date'
 require 'set'
 require 'bigdecimal'
 require 'bigdecimal/util'
-require 'active_support/core_ext/string/strip'
 
 module ActiveRecord
   module ConnectionAdapters #:nodoc:
@@ -61,12 +60,11 @@ module ActiveRecord
       def emit_warning_if_null_unspecified(options)
         return if options.key?(:null)
 
-        ActiveSupport::Deprecation.warn(<<-MESSAGE.strip_heredoc)
-        `timestamp` was called without specifying an option for `null`. In Rails
-        5.0, this behavior will change to `null: false`. You should manually
-        specify `null: true` to prevent the behavior of your existing migrations
-        from changing.
-        MESSAGE
+        ActiveSupport::Deprecation.warn \
+          "`timestamp` was called without specifying an option for `null`. In Rails " \
+          "5.0, this behavior will change to `null: false`. You should manually " \
+          "specify `null: true` to prevent the behavior of your existing migrations " \
+          "from changing."
       end
     end
 
@@ -327,7 +325,6 @@ module ActiveRecord
         end
 
         column.limit       = limit
-        column.array       = options[:array] if column.respond_to?(:array)
         column.precision   = options[:precision]
         column.scale       = options[:scale]
         column.default     = options[:default]

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

@@ -19,12 +19,16 @@ module ActiveRecord
         spec = {}
         spec[:name]      = column.name.inspect
         spec[:type]      = column.type.to_s
-        spec[:limit]     = column.limit.inspect if column.limit != types[column.type][:limit]
+        spec[:null]      = 'false' unless column.null
+
+        limit = column.limit || types[column.type][:limit]
+        spec[:limit]     = limit.inspect if limit
         spec[:precision] = column.precision.inspect if column.precision
         spec[:scale]     = column.scale.inspect if column.scale
-        spec[:null]      = 'false' unless column.null
-        spec[:default]   = schema_default(column) if column.has_default?
-        spec.delete(:default) if spec[:default].nil?
+
+        default = schema_default(column) if column.has_default?
+        spec[:default]   = default unless default.nil?
+
         spec
       end
 

data/lib/active_record/connection_adapters/abstract/transaction.rb

@@ -190,11 +190,17 @@ module ActiveRecord
         rollback_transaction if transaction
         raise
       ensure
-        begin
-          commit_transaction unless error
-        rescue Exception
-          transaction.rollback unless transaction.state.completed?
-          raise
+        unless error
+          if Thread.current.status == 'aborting'
+            rollback_transaction
+          else
+            begin
+              commit_transaction
+            rescue Exception
+              transaction.rollback unless transaction.state.completed?
+              raise
+            end
+          end
         end
       end
 

data/lib/active_record/connection_adapters/abstract_adapter.rb

@@ -66,6 +66,7 @@ module ActiveRecord
     # Most of the methods in the adapter are useful during migrations. Most
     # notably, the instance methods provided by SchemaStatement are very useful.
     class AbstractAdapter
+      ADAPTER_NAME = 'Abstract'.freeze
       include Quoting, DatabaseStatements, SchemaStatements
       include DatabaseLimits
       include QueryCache
@@ -167,7 +168,7 @@ module ActiveRecord
       # Returns the human-readable name of the adapter. Use mixed case - one
       # can always use downcase if needed.
       def adapter_name
-        'Abstract'
+        self.class::ADAPTER_NAME
       end
 
       # Does this adapter support migrations?
@@ -239,6 +240,11 @@ module ActiveRecord
         false
       end
 
+      # Does this adapter support views?
+      def supports_views?
+        false
+      end
+
       # This is meant to be implemented by the adapters that support extensions
       def disable_extension(name)
       end

data/lib/active_record/connection_adapters/abstract_mysql_adapter.rb

@@ -1,4 +1,5 @@
 require 'arel/visitors/bind_visitor'
+require 'active_support/core_ext/string/strip'
 
 module ActiveRecord
   module ConnectionAdapters
@@ -161,10 +162,6 @@ module ActiveRecord
         end
       end
 
-      def adapter_name #:nodoc:
-        self.class::ADAPTER_NAME
-      end
-
       # Returns true, since this connection adapter supports migrations.
       def supports_migrations?
         true
@@ -200,6 +197,10 @@ module ActiveRecord
         true
       end
 
+      def supports_views?
+        version[0] >= 5
+      end
+
       def native_database_types
         NATIVE_DATABASE_TYPES
       end
@@ -388,6 +389,10 @@ module ActiveRecord
         end
       end
 
+      def truncate(table_name, name = nil)
+        execute "TRUNCATE TABLE #{quote_table_name(table_name)}", name
+      end
+
       def table_exists?(name)
         return false unless name.present?
         return true if tables(nil, nil, name).any?
@@ -639,18 +644,21 @@ module ActiveRecord
 
       def initialize_type_map(m) # :nodoc:
         super
+
         m.register_type(%r(enum)i) do |sql_type|
           limit = sql_type[/^enum\((.+)\)/i, 1]
             .split(',').map{|enum| enum.strip.length - 2}.max
           Type::String.new(limit: limit)
         end
 
-        m.register_type %r(tinytext)i,   Type::Text.new(limit: 255)
-        m.register_type %r(tinyblob)i,   Type::Binary.new(limit: 255)
-        m.register_type %r(mediumtext)i, Type::Text.new(limit: 16777215)
-        m.register_type %r(mediumblob)i, Type::Binary.new(limit: 16777215)
-        m.register_type %r(longtext)i,   Type::Text.new(limit: 2147483647)
-        m.register_type %r(longblob)i,   Type::Binary.new(limit: 2147483647)
+        m.register_type %r(tinytext)i,   Type::Text.new(limit: 2**8 - 1)
+        m.register_type %r(tinyblob)i,   Type::Binary.new(limit: 2**8 - 1)
+        m.register_type %r(text)i,       Type::Text.new(limit: 2**16 - 1)
+        m.register_type %r(blob)i,       Type::Binary.new(limit: 2**16 - 1)
+        m.register_type %r(mediumtext)i, Type::Text.new(limit: 2**24 - 1)
+        m.register_type %r(mediumblob)i, Type::Binary.new(limit: 2**24 - 1)
+        m.register_type %r(longtext)i,   Type::Text.new(limit: 2**32 - 1)
+        m.register_type %r(longblob)i,   Type::Binary.new(limit: 2**32 - 1)
         m.register_type %r(^bigint)i,    Type::Integer.new(limit: 8)
         m.register_type %r(^int)i,       Type::Integer.new(limit: 4)
         m.register_type %r(^mediumint)i, Type::Integer.new(limit: 3)
@@ -782,10 +790,6 @@ module ActiveRecord
         full_version =~ /mariadb/i
       end
 
-      def supports_views?
-        version[0] >= 5
-      end
-
       def supports_rename_index?
         mariadb? ? false : (version[0] == 5 && version[1] >= 7) || version[0] >= 6
       end
@@ -812,7 +816,11 @@ module ActiveRecord
         # NAMES does not have an equals sign, see
         # http://dev.mysql.com/doc/refman/5.0/en/set-statement.html#id944430
         # (trailing comma because variable_assignments will always have content)
-        encoding = "NAMES #{@config[:encoding]}, " if @config[:encoding]
+        if @config[:encoding]
+          encoding = "NAMES #{@config[:encoding]}"
+          encoding << " COLLATE #{@config[:collation]}" if @config[:collation]
+          encoding << ", "
+        end
 
         # Gather up all of the SET variables...
         variable_assignments = variables.map do |k, v|

data/lib/active_record/connection_adapters/mysql2_adapter.rb

@@ -29,7 +29,7 @@ module ActiveRecord
 
   module ConnectionAdapters
     class Mysql2Adapter < AbstractMysqlAdapter
-      ADAPTER_NAME = 'Mysql2'
+      ADAPTER_NAME = 'Mysql2'.freeze
 
       def initialize(connection, logger, connection_options, config)
         super

data/lib/active_record/connection_adapters/mysql_adapter.rb

@@ -66,7 +66,7 @@ module ActiveRecord
     # * <tt>:sslcipher</tt> - Necessary to use MySQL with an SSL connection.
     #
     class MysqlAdapter < AbstractMysqlAdapter
-      ADAPTER_NAME = 'MySQL'
+      ADAPTER_NAME = 'MySQL'.freeze
 
       class StatementPool < ConnectionAdapters::StatementPool
         def initialize(connection, max = 1000)

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

@@ -25,10 +25,10 @@ module ActiveRecord
             if !infinity?(from) && extracted[:exclude_start]
               if from.respond_to?(:succ)
                 from = from.succ
-                ActiveSupport::Deprecation.warn <<-MESSAGE
-Excluding the beginning of a Range is only partialy supported through `#succ`.
-This is not reliable and will be removed in the future.
-                MESSAGE
+                ActiveSupport::Deprecation.warn \
+                  "Excluding the beginning of a Range is only partialy supported " \
+                  "through `#succ`. This is not reliable and will be removed in " \
+                  "the future."
               else
                 raise ArgumentError, "The Ruby Range object does not support excluding the beginning of a Range. (unsupported value: '#{value}')"
               end

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

@@ -12,6 +12,8 @@ module ActiveRecord
                              [a-fA-F0-9]{4}-?
                              [a-fA-F0-9]{4}-?\}?\z}x
 
+          alias_method :type_cast_for_database, :type_cast_from_database
+
           def type
             :uuid
           end

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

@@ -131,12 +131,10 @@ module ActiveRecord
           column name, type, options
         end
 
-        def column(name, type = nil, options = {})
-          super
-          column = self[name]
+        def new_column_definition(name, type, options) # :nodoc:
+          column = super
           column.array = options[:array]
-
-          self
+          column
         end
 
         private

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

@@ -60,8 +60,8 @@ module ActiveRecord
         def create_database(name, options = {})
           options = { encoding: 'utf8' }.merge!(options.symbolize_keys)
 
-          option_string = options.sum do |key, value|
-            case key
+          option_string = options.inject("") do |memo, (key, value)|
+            memo += case key
             when :owner
               " OWNER = \"#{value}\""
             when :template
@@ -281,9 +281,9 @@ module ActiveRecord
         def default_sequence_name(table_name, pk = nil) #:nodoc:
           result = serial_sequence(table_name, pk || 'id')
           return nil unless result
-          Utils.extract_schema_qualified_name(result)
+          Utils.extract_schema_qualified_name(result).to_s
         rescue ActiveRecord::StatementInvalid
-          PostgreSQL::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq")
+          PostgreSQL::Name.new(nil, "#{table_name}_#{pk || 'id'}_seq").to_s
         end
 
         def serial_sequence(table, column)
@@ -466,7 +466,7 @@ module ActiveRecord
 
         def foreign_keys(table_name)
           fk_info = select_all <<-SQL.strip_heredoc
-            SELECT t2.relname AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
+            SELECT t2.oid::regclass::text AS to_table, a1.attname AS column, a2.attname AS primary_key, c.conname AS name, c.confupdtype AS on_update, c.confdeltype AS on_delete
             FROM pg_constraint c
             JOIN pg_class t1 ON c.conrelid = t1.oid
             JOIN pg_class t2 ON c.confrelid = t2.oid
@@ -488,6 +488,7 @@ module ActiveRecord
 
             options[:on_delete] = extract_foreign_key_action(row['on_delete'])
             options[:on_update] = extract_foreign_key_action(row['on_update'])
+
             ForeignKeyDefinition.new(table_name, row['to_table'], options)
           end
         end
@@ -549,7 +550,8 @@ module ActiveRecord
               # Convert Arel node to string
               s = s.to_sql unless s.is_a?(String)
               # Remove any ASC/DESC modifiers
-              s.gsub(/\s+(?:ASC|DESC)?\s*(?:NULLS\s+(?:FIRST|LAST)\s*)?/i, '')
+              s.gsub(/\s+(?:ASC|DESC)\b/i, '')
+               .gsub(/\s+NULLS\s+(?:FIRST|LAST)\b/i, '')
             }.reject(&:blank?).map.with_index { |column, i| "#{column} AS alias_#{i}" }
 
           [super, *order_columns].join(', ')

data/lib/active_record/connection_adapters/postgresql_adapter.rb

@@ -74,7 +74,7 @@ module ActiveRecord
     # In addition, default connection parameters of libpq can be set per environment variables.
     # See http://www.postgresql.org/docs/9.1/static/libpq-envars.html .
     class PostgreSQLAdapter < AbstractAdapter
-      ADAPTER_NAME = 'PostgreSQL'
+      ADAPTER_NAME = 'PostgreSQL'.freeze
 
       NATIVE_DATABASE_TYPES = {
         primary_key: "serial primary key",
@@ -118,11 +118,6 @@ module ActiveRecord
       include PostgreSQL::DatabaseStatements
       include Savepoints
 
-      # Returns 'PostgreSQL' as adapter name for identification purposes.
-      def adapter_name
-        ADAPTER_NAME
-      end
-
       def schema_creation # :nodoc:
         PostgreSQL::SchemaCreation.new self
       end
@@ -163,6 +158,10 @@ module ActiveRecord
         true
       end
 
+      def supports_views?
+        true
+      end
+
       def index_algorithms
         { concurrently: 'CONCURRENTLY' }
       end
@@ -256,6 +255,10 @@ module ActiveRecord
         @statements.clear
       end
 
+      def truncate(table_name, name = nil)
+        exec_query "TRUNCATE TABLE #{quote_table_name(table_name)}", name, []
+      end
+
       # Is this connection alive and ready for queries?
       def active?
         @connection.query 'SELECT 1'

data/lib/active_record/connection_adapters/sqlite3_adapter.rb

@@ -67,6 +67,7 @@ module ActiveRecord
     #
     # * <tt>:database</tt> - Path to the database file.
     class SQLite3Adapter < AbstractAdapter
+      ADAPTER_NAME = 'SQLite'.freeze
       include Savepoints
 
       NATIVE_DATABASE_TYPES = {
@@ -147,10 +148,6 @@ module ActiveRecord
         end
       end
 
-      def adapter_name #:nodoc:
-        'SQLite'
-      end
-
       def supports_ddl_transactions?
         true
       end
@@ -186,6 +183,10 @@ module ActiveRecord
         true
       end
 
+      def supports_views?
+        true
+      end
+
       def active?
         @active != false
       end
@@ -372,7 +373,7 @@ module ActiveRecord
         sql = <<-SQL
           SELECT name
           FROM sqlite_master
-          WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+          WHERE (type = 'table' OR type = 'view') AND NOT name = 'sqlite_sequence'
         SQL
         sql << " AND name = #{quote_table_name(table_name)}" if table_name
 

data/lib/active_record/core.rb

@@ -124,6 +124,8 @@ module ActiveRecord
       def find(*ids)
         # We don't have cache keys for this stuff yet
         return super unless ids.length == 1
+        # Allow symbols to super to maintain compatibility for deprecated finders until Rails 5
+        return super if ids.first.kind_of?(Symbol)
         return super if block_given? ||
                         primary_key.nil? ||
                         default_scopes.any? ||
@@ -151,7 +153,8 @@ module ActiveRecord
       end
 
       def find_by(*args)
-        return super if current_scope || args.length > 1 || reflect_on_all_aggregations.any?
+        return super if current_scope || !(Hash === args.first) || reflect_on_all_aggregations.any?
+        return super if default_scopes.any?
 
         hash = args.first
 
@@ -159,6 +162,9 @@ module ActiveRecord
           v.nil? || Array === v || Hash === v
         }
 
+        # We can't cache Post.find_by(author: david) ...yet
+        return super unless hash.keys.all? { |k| columns_hash.has_key?(k.to_s) }
+
         key  = hash.keys
 
         klass = self
@@ -177,9 +183,11 @@ module ActiveRecord
         end
       end
 
-      def initialize_generated_modules
-        super
+      def find_by!(*args)
+        find_by(*args) or raise RecordNotFound.new("Couldn't find #{name}")
+      end
 
+      def initialize_generated_modules
         generated_association_methods
       end