activerecord 4.0.0.beta1 → 4.0.0.rc1

data/lib/active_record/tasks/sqlserver_database_tasks.rb

@@ -0,0 +1,48 @@
+require 'shellwords'
+
+module ActiveRecord
+  module Tasks # :nodoc:
+    class SqlserverDatabaseTasks # :nodoc:
+      delegate :connection, :establish_connection, to: ActiveRecord::Base
+
+      def initialize(configuration)
+        ActiveSupport::Deprecation.warn "This database tasks were deprecated, because this tasks should be served by the 3rd party adapter."
+        @configuration = configuration
+      end
+
+      def create
+        $stderr.puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      end
+
+      def drop
+        $stderr.puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      end
+
+      def purge
+        test = configuration.deep_dup
+        test_database = test['database']
+        test['database'] = 'master'
+        establish_connection(test)
+        connection.recreate_database!(test_database)
+      end
+
+      def charset
+        $stderr.puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      end
+
+      def structure_dump(filename)
+        Kernel.system("smoscript -s #{configuration['host']} -d #{configuration['database']} -u #{configuration['username']} -p #{configuration['password']} -f #{filename} -A -U")
+      end
+
+      def structure_load(filename)
+        Kernel.system("sqlcmd -S #{configuration['host']} -d #{configuration['database']} -U #{configuration['username']} -P #{configuration['password']} -i #{filename}")
+      end
+
+      private
+
+      def configuration
+        @configuration
+      end
+    end
+  end
+end

data/lib/active_record/timestamp.rb

@@ -98,6 +98,12 @@ module ActiveRecord
       timestamp_attributes_for_create + timestamp_attributes_for_update
     end
 
+    def max_updated_column_timestamp
+      if (timestamps = timestamp_attributes_for_update.map { |attr| self[attr] }.compact).present?
+        timestamps.map { |ts| ts.to_time }.max
+      end
+    end
+
     def current_time_from_proper_timezone
       self.class.default_timezone == :utc ? Time.now.utc : Time.now
     end

data/lib/active_record/transactions.rb

@@ -160,7 +160,7 @@ module ActiveRecord
     #     end
     #   end
     #
-    # only "Kotori" is created. (This works on MySQL and PostgreSQL, but not on SQLite3.)
+    # only "Kotori" is created. This works on MySQL and PostgreSQL. SQLite3 version >= '3.6.8' also supports it.
     #
     # Most databases don't support true nested transactions. At the time of
     # writing, the only database that we're aware of that supports true nested
@@ -339,8 +339,12 @@ module ActiveRecord
     # Save the new record state and id of a record so it can be restored later if a transaction fails.
     def remember_transaction_record_state #:nodoc:
       @_start_transaction_state[:id] = id if has_attribute?(self.class.primary_key)
-      @_start_transaction_state[:new_record] = @new_record
-      @_start_transaction_state[:destroyed] = @destroyed
+      unless @_start_transaction_state.include?(:new_record)
+        @_start_transaction_state[:new_record] = @new_record
+      end
+      unless @_start_transaction_state.include?(:destroyed)
+        @_start_transaction_state[:destroyed] = @destroyed
+      end
       @_start_transaction_state[:level] = (@_start_transaction_state[:level] || 0) + 1
       @_start_transaction_state[:frozen?] = @attributes.frozen?
     end

data/lib/active_record/validations.rb

@@ -74,8 +74,7 @@ module ActiveRecord
   protected
 
     def perform_validations(options={}) # :nodoc:
-      perform_validation = options[:validate] != false
-      perform_validation ? valid?(options[:context]) : true
+      options[:validate] == false || valid?(options[:context])
     end
   end
 end

data/lib/active_record/validations/uniqueness.rb

@@ -2,6 +2,10 @@ module ActiveRecord
   module Validations
     class UniquenessValidator < ActiveModel::EachValidator # :nodoc:
       def initialize(options)
+        if options[:conditions] && !options[:conditions].respond_to?(:call)
+          raise ArgumentError, "#{options[:conditions]} was passed as :conditions but is not callable. " \
+                               "Pass a callable instead: `conditions: -> { where(approved: true) }`"
+        end
         super({ case_sensitive: true }.merge!(options))
       end
 
@@ -19,7 +23,7 @@ module ActiveRecord
         relation = relation.and(table[finder_class.primary_key.to_sym].not_eq(record.id)) if record.persisted?
         relation = scope_relation(record, table, relation)
         relation = finder_class.unscoped.where(relation)
-        relation.merge!(options[:conditions]) if options[:conditions]
+        relation = relation.merge(options[:conditions]) if options[:conditions]
 
         if relation.exists?
           error_options = options.except(:case_sensitive, :scope, :conditions)
@@ -116,7 +120,7 @@ module ActiveRecord
       # of the title attribute:
       #
       #   class Article < ActiveRecord::Base
-      #     validates_uniqueness_of :title, conditions: where('status != ?', 'archived')
+      #     validates_uniqueness_of :title, conditions: -> { where.not(status: 'archived') }
       #   end
       #
       # When the record is created, a check is performed to make sure that no
@@ -132,7 +136,7 @@ module ActiveRecord
       #   the uniqueness constraint.
       # * <tt>:conditions</tt> - Specify the conditions to be included as a
       #   <tt>WHERE</tt> SQL fragment to limit the uniqueness constraint lookup
-      #   (e.g. <tt>conditions: where('status = ?', 'active')</tt>).
+      #   (e.g. <tt>conditions: -> { where(status: 'active') }</tt>).
       # * <tt>:case_sensitive</tt> - Looks for an exact match. Ignored by
       #   non-text columns (+true+ by default).
       # * <tt>:allow_nil</tt> - If set to +true+, skips this validation if the

data/lib/active_record/version.rb

@@ -1,10 +1,11 @@
 module ActiveRecord
-  module VERSION #:nodoc:
-    MAJOR = 4
-    MINOR = 0
-    TINY  = 0
-    PRE   = "beta1"
+  # Returns the version of the currently loaded ActiveRecord as a Gem::Version
+  def self.version
+    Gem::Version.new "4.0.0.rc1"
+  end
 
-    STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+  module VERSION #:nodoc:
+    MAJOR, MINOR, TINY, PRE = ActiveRecord.version.segments
+    STRING = ActiveRecord.version.to_s
   end
 end

data/lib/rails/generators/active_record/migration/migration_generator.rb

@@ -8,13 +8,14 @@ module ActiveRecord
       def create_migration_file
         set_local_assigns!
         validate_file_name!
-        migration_template "migration.rb", "db/migrate/#{file_name}.rb"
+        migration_template @migration_template, "db/migrate/#{file_name}.rb"
       end
 
       protected
       attr_reader :migration_action, :join_tables
 
       def set_local_assigns!
+        @migration_template = "migration.rb"
         case file_name
         when /^(add|remove)_.*_(?:to|from)_(.*)/
           @migration_action = $1
@@ -26,6 +27,9 @@ module ActiveRecord
 
             set_index_names
           end
+        when /^create_(.+)/
+          @table_name = $1.pluralize
+          @migration_template = "create_table_migration.rb"
         end
       end
 
@@ -44,7 +48,10 @@ module ActiveRecord
       end
 
       private
-
+        def attributes_with_index
+          attributes.select { |a| !a.reference? && a.has_index? }
+        end
+        
         def validate_file_name!
           unless file_name =~ /^[_a-z0-9]+$/
             raise IllegalMigrationNameError.new(file_name)

data/lib/rails/generators/active_record/{model/templates/migration.rb → migration/templates/create_table_migration.rb}

@@ -2,8 +2,12 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %> do |t|
 <% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+      t.string :password_digest<%= attribute.inject_options %>
+<% else -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
+<% end -%>
 <% if options[:timestamps] %>
       t.timestamps
 <% end -%>

data/lib/rails/generators/active_record/model/model_generator.rb

@@ -15,7 +15,7 @@ module ActiveRecord
       def create_migration_file
         return unless options[:migration] && options[:parent].nil?
         attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
-        migration_template "migration.rb", "db/migrate/create_#{table_name}.rb"
+        migration_template "../../migration/templates/create_table_migration.rb", "db/migrate/create_#{table_name}.rb"
       end
 
       def create_model_file

data/lib/rails/generators/active_record/model/templates/model.rb

@@ -1,7 +1,10 @@
 <% module_namespacing do -%>
 class <%= class_name %> < <%= parent_class_name.classify %>
-<% attributes.select {|attr| attr.reference? }.each do |attribute| -%>
+<% attributes.select(&:reference?).each do |attribute| -%>
   belongs_to :<%= attribute.name %><%= ', polymorphic: true' if attribute.polymorphic? %>
 <% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+  has_secure_password
+<% end -%>
 end
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord
 version: !ruby/object:Gem::Version
-  version: 4.0.0.beta1
+  version: 4.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,56 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta1
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: activerecord-deprecated_finders
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 1.0.2
 description: Databases on Rails. Build a persistent domain model by mapping database
   tables to Ruby classes. Strong conventions for associations, validations, aggregations,
   migrations, and testing come baked-in.
@@ -78,7 +78,6 @@ files:
 - CHANGELOG.md
 - MIT-LICENSE
 - README.rdoc
-- examples/associations.png
 - examples/performance.rb
 - examples/simple.rb
 - lib/active_record/aggregations.rb
@@ -166,6 +165,7 @@ files:
 - lib/active_record/dynamic_matchers.rb
 - lib/active_record/errors.rb
 - lib/active_record/explain.rb
+- lib/active_record/explain_registry.rb
 - lib/active_record/explain_subscriber.rb
 - lib/active_record/fixture_set/file.rb
 - lib/active_record/fixtures.rb
@@ -201,6 +201,7 @@ files:
 - lib/active_record/relation/spawn_methods.rb
 - lib/active_record/relation.rb
 - lib/active_record/result.rb
+- lib/active_record/runtime_registry.rb
 - lib/active_record/sanitization.rb
 - lib/active_record/schema.rb
 - lib/active_record/schema_dumper.rb
@@ -210,11 +211,15 @@ files:
 - lib/active_record/scoping.rb
 - lib/active_record/serialization.rb
 - lib/active_record/serializers/xml_serializer.rb
+- lib/active_record/statement_cache.rb
 - lib/active_record/store.rb
 - lib/active_record/tasks/database_tasks.rb
+- lib/active_record/tasks/firebird_database_tasks.rb
 - lib/active_record/tasks/mysql_database_tasks.rb
+- lib/active_record/tasks/oracle_database_tasks.rb
 - lib/active_record/tasks/postgresql_database_tasks.rb
 - lib/active_record/tasks/sqlite_database_tasks.rb
+- lib/active_record/tasks/sqlserver_database_tasks.rb
 - lib/active_record/test_case.rb
 - lib/active_record/timestamp.rb
 - lib/active_record/transactions.rb
@@ -226,9 +231,9 @@ files:
 - lib/active_record/version.rb
 - lib/active_record.rb
 - lib/rails/generators/active_record/migration/migration_generator.rb
+- lib/rails/generators/active_record/migration/templates/create_table_migration.rb
 - lib/rails/generators/active_record/migration/templates/migration.rb
 - lib/rails/generators/active_record/model/model_generator.rb
-- lib/rails/generators/active_record/model/templates/migration.rb
 - lib/rails/generators/active_record/model/templates/model.rb
 - lib/rails/generators/active_record/model/templates/module.rb
 - lib/rails/generators/active_record.rb