activerecord 4.0.0.beta1 → 4.0.0.rc1

data/lib/active_record/schema_migration.rb

@@ -13,18 +13,21 @@ module ActiveRecord
       "#{Base.table_name_prefix}unique_schema_migrations#{Base.table_name_suffix}"
     end
 
-    def self.create_table
+    def self.create_table(limit=nil)
       unless connection.table_exists?(table_name)
-        connection.create_table(table_name, :id => false) do |t|
-          t.column :version, :string, :null => false
+        version_options = {null: false}
+        version_options[:limit] = limit if limit
+
+        connection.create_table(table_name, id: false) do |t|
+          t.column :version, :string, version_options
         end
-        connection.add_index table_name, :version, :unique => true, :name => index_name
+        connection.add_index table_name, :version, unique: true, name: index_name
       end
     end
 
     def self.drop_table
       if connection.table_exists?(table_name)
-        connection.remove_index table_name, :name => index_name
+        connection.remove_index table_name, name: index_name
         connection.drop_table(table_name)
       end
     end

data/lib/active_record/scoping.rb

@@ -1,3 +1,5 @@
+require 'active_support/per_thread_registry'
+
 module ActiveRecord
   module Scoping
     extend ActiveSupport::Concern
@@ -9,11 +11,11 @@ module ActiveRecord
 
     module ClassMethods
       def current_scope #:nodoc:
-        Thread.current["#{self}_current_scope"]
+        ScopeRegistry.value_for(:current_scope, base_class.to_s)
       end
 
       def current_scope=(scope) #:nodoc:
-        Thread.current["#{self}_current_scope"] = scope
+        ScopeRegistry.set_value_for(:current_scope, base_class.to_s, scope)
       end
     end
 
@@ -24,5 +26,57 @@ module ActiveRecord
         send("#{att}=", value) if respond_to?("#{att}=")
       end
     end
+
+    # This class stores the +:current_scope+ and +:ignore_default_scope+ values
+    # for different classes. The registry is stored as a thread local, which is
+    # accessed through +ScopeRegistry.current+.
+    #
+    # This class allows you to store and get the scope values on different
+    # classes and different types of scopes. For example, if you are attempting
+    # to get the current_scope for the +Board+ model, then you would use the
+    # following code:
+    #
+    #   registry = ActiveRecord::Scoping::ScopeRegistry
+    #   registry.set_value_for(:current_scope, "Board", some_new_scope)
+    #
+    # Now when you run:
+    #
+    #   registry.value_for(:current_scope, "Board")
+    #
+    # You will obtain whatever was defined in +some_new_scope+. The +value_for+
+    # and +set_value_for+ methods are delegated to the current +ScopeRegistry+
+    # object, so the above example code can also be called as:
+    #
+    #   ActiveRecord::Scoping::ScopeRegistry.set_value_for(:current_scope,
+    #       "Board", some_new_scope)
+    class ScopeRegistry # :nodoc:
+      extend ActiveSupport::PerThreadRegistry
+
+      VALID_SCOPE_TYPES = [:current_scope, :ignore_default_scope]
+
+      def initialize
+        @registry = Hash.new { |hash, key| hash[key] = {} }
+      end
+
+      # Obtains the value for a given +scope_name+ and +variable_name+.
+      def value_for(scope_type, variable_name)
+        raise_invalid_scope_type!(scope_type)
+        @registry[scope_type][variable_name]
+      end
+
+      # Sets the +value+ for a given +scope_type+ and +variable_name+.
+      def set_value_for(scope_type, variable_name, value)
+        raise_invalid_scope_type!(scope_type)
+        @registry[scope_type][variable_name] = value
+      end
+
+      private
+
+      def raise_invalid_scope_type!(scope_type)
+        if !VALID_SCOPE_TYPES.include?(scope_type)
+          raise ArgumentError, "Invalid scope type '#{scope_type}' sent to the registry. Scope types must be included in VALID_SCOPE_TYPES"
+        end
+      end
+    end
   end
 end

data/lib/active_record/scoping/default.rb

@@ -5,8 +5,17 @@ module ActiveRecord
 
       included do
         # Stores the default scope for the class.
-        class_attribute :default_scopes, instance_writer: false
+        class_attribute :default_scopes, instance_writer: false, instance_predicate: false
+
         self.default_scopes = []
+
+        def self.default_scopes?
+          ActiveSupport::Deprecation.warn(
+            "#default_scopes? is deprecated. Do something like #default_scopes.empty? instead."
+          )
+
+          !!self.default_scopes
+        end
       end
 
       module ClassMethods
@@ -27,14 +36,6 @@ module ActiveRecord
         #   Post.unscoped {
         #     Post.limit(10) # Fires "SELECT * FROM posts LIMIT 10"
         #   }
-        #
-        # It is recommended that you use the block form of unscoped because
-        # chaining unscoped with +scope+ does not work. Assuming that
-        # +published+ is a +scope+, the following two statements
-        # are equal: the +default_scope+ is applied on both.
-        #
-        #   Post.unscoped.published
-        #   Post.published
         def unscoped
           block_given? ? relation.scoping { yield } : relation
         end
@@ -119,11 +120,11 @@ module ActiveRecord
         end
 
         def ignore_default_scope? # :nodoc:
-          Thread.current["#{self}_ignore_default_scope"]
+          ScopeRegistry.value_for(:ignore_default_scope, self)
         end
 
         def ignore_default_scope=(ignore) # :nodoc:
-          Thread.current["#{self}_ignore_default_scope"] = ignore
+          ScopeRegistry.set_value_for(:ignore_default_scope, self, ignore)
         end
 
         # The ignore_default_scope flag is used to prevent an infinite recursion

data/lib/active_record/scoping/named.rb

@@ -159,10 +159,14 @@ module ActiveRecord
           end
 
           singleton_class.send(:define_method, name) do |*args|
-            options  = body.respond_to?(:call) ? unscoped { body.call(*args) } : body
-            relation = all.merge(options)
+            if body.respond_to?(:call)
+              scope = all.scoping { body.call(*args) }
+              scope = scope.extending(extension) if extension
+            else
+              scope = body
+            end
 
-            extension ? relation.extending(extension) : relation
+            scope || all
           end
         end
       end

data/lib/active_record/serialization.rb

@@ -5,7 +5,7 @@ module ActiveRecord #:nodoc:
     include ActiveModel::Serializers::JSON
 
     included do
-      self.include_root_in_json = true
+      self.include_root_in_json = false
     end
 
     def serializable_hash(options = nil)

data/lib/active_record/statement_cache.rb

@@ -0,0 +1,26 @@
+module ActiveRecord
+
+  # Statement cache is used to cache a single statement in order to avoid creating the AST again.
+  # Initializing the cache is done by passing the statement in the initialization block:
+  #
+  #   cache = ActiveRecord::StatementCache.new do
+  #     Book.where(name: "my book").limit(100)
+  #   end
+  #
+  # The cached statement is executed by using the +execute+ method:
+  #
+  #   cache.execute
+  #
+  # The relation returned by the block is cached, and for each +execute+ call the cached relation gets duped.
+  # Database is queried when +to_a+ is called on the relation.
+  class StatementCache
+    def initialize
+      @relation = yield
+      raise ArgumentError.new("Statement cannot be nil") if @relation.nil?
+    end
+
+    def execute
+      @relation.dup.to_a
+    end
+  end
+end

data/lib/active_record/tasks/database_tasks.rb

@@ -3,10 +3,41 @@ module ActiveRecord
     class DatabaseAlreadyExists < StandardError; end # :nodoc:
     class DatabaseNotSupported < StandardError; end # :nodoc:
 
-    module DatabaseTasks # :nodoc:
+    # <tt>ActiveRecord::Tasks::DatabaseTasks</tt> is a utility class, which encapsulates
+    # logic behind common tasks used to manage database and migrations.
+    #
+    # The tasks defined here are used in rake tasks provided by Active Record.
+    #
+    # In order to use DatabaseTasks, a few config values need to be set. All the needed
+    # config values are set by Rails already, so it's necessary to do it only if you
+    # want to change the defaults or when you want to use Active Record outside of Rails
+    # (in such case after configuring the database tasks, you can also use the rake tasks
+    # defined in Active Record).
+    #
+    #
+    # The possible config values are:
+    #
+    #   * +env+: current environment (like Rails.env).
+    #   * +database_configuration+: configuration of your databases (as in +config/database.yml+).
+    #   * +db_dir+: your +db+ directory.
+    #   * +fixtures_path+: a path to fixtures directory.
+    #   * +migrations_paths+: a list of paths to directories with migrations.
+    #   * +seed_loader+: an object which will load seeds, it needs to respond to the +load_seed+ method.
+    #
+    # Example usage of +DatabaseTasks+ outside Rails could look as such:
+    #
+    #   include ActiveRecord::Tasks
+    #   DatabaseTasks.database_configuration = YAML.load(File.read('my_database_config.yml'))
+    #   DatabaseTasks.db_dir = 'db'
+    #   # other settings...
+    #
+    #   DatabaseTasks.create_current('production')
+    module DatabaseTasks
       extend self
 
       attr_writer :current_config
+      attr_accessor :database_configuration, :migrations_paths, :seed_loader, :db_dir,
+                    :fixtures_path, :env
 
       LOCAL_HOSTS    = ['127.0.0.1', 'localhost']
 
@@ -15,12 +46,16 @@ module ActiveRecord
         @tasks[pattern] = task
       end
 
-      register_task(/mysql/, ActiveRecord::Tasks::MySQLDatabaseTasks)
-      register_task(/postgresql/, ActiveRecord::Tasks::PostgreSQLDatabaseTasks)
-      register_task(/sqlite/, ActiveRecord::Tasks::SQLiteDatabaseTasks)
+      register_task(/mysql/,        ActiveRecord::Tasks::MySQLDatabaseTasks)
+      register_task(/postgresql/,   ActiveRecord::Tasks::PostgreSQLDatabaseTasks)
+      register_task(/sqlite/,       ActiveRecord::Tasks::SQLiteDatabaseTasks)
+
+      register_task(/firebird/,     ActiveRecord::Tasks::FirebirdDatabaseTasks)
+      register_task(/sqlserver/,    ActiveRecord::Tasks::SqlserverDatabaseTasks)
+      register_task(/(oci|oracle)/, ActiveRecord::Tasks::OracleDatabaseTasks)
 
       def current_config(options = {})
-        options.reverse_merge! :env => Rails.env
+        options.reverse_merge! :env => env
         if options.has_key?(:config)
           @current_config = options[:config]
         else
@@ -46,7 +81,7 @@ module ActiveRecord
         each_local_configuration { |configuration| create configuration }
       end
 
-      def create_current(environment = Rails.env)
+      def create_current(environment = env)
         each_current_configuration(environment) { |configuration|
           create configuration
         }
@@ -69,7 +104,7 @@ module ActiveRecord
         each_local_configuration { |configuration| drop configuration }
       end
 
-      def drop_current(environment = Rails.env)
+      def drop_current(environment = env)
         each_current_configuration(environment) { |configuration|
           drop configuration
         }
@@ -79,7 +114,7 @@ module ActiveRecord
         drop database_url_config
       end
 
-      def charset_current(environment = Rails.env)
+      def charset_current(environment = env)
         charset ActiveRecord::Base.configurations[environment]
       end
 
@@ -88,7 +123,7 @@ module ActiveRecord
         class_for_adapter(configuration['adapter']).new(*arguments).charset
       end
 
-      def collation_current(environment = Rails.env)
+      def collation_current(environment = env)
         collation ActiveRecord::Base.configurations[environment]
       end
 
@@ -113,6 +148,16 @@ module ActiveRecord
         class_for_adapter(configuration['adapter']).new(*arguments).structure_load(filename)
       end
 
+      def load_seed
+        if seed_loader
+          seed_loader.load_seed
+        else
+          raise "You tried to load seed data, but no seed loader is specified. Please specify seed " +
+                "loader with ActiveRecord::Tasks::DatabaseTasks.seed_loader = your_seed_loader\n" +
+                "Seed loader should respond to load_seed method"
+        end
+      end
+
       private
 
       def database_url_config
@@ -130,7 +175,7 @@ module ActiveRecord
 
       def each_current_configuration(environment)
         environments = [environment]
-        environments << 'test' if environment.development?
+        environments << 'test' if environment == 'development'
 
         configurations = ActiveRecord::Base.configurations.values_at(*environments)
         configurations.compact.each do |configuration|

data/lib/active_record/tasks/firebird_database_tasks.rb

@@ -0,0 +1,56 @@
+module ActiveRecord
+  module Tasks # :nodoc:
+    class FirebirdDatabaseTasks # :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
+        establish_connection(:test)
+        connection.recreate_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)
+        set_firebird_env(configuration)
+        db_string = firebird_db_string(configuration)
+        Kernel.system "isql -a #{db_string} > #{filename}"
+      end
+
+      def structure_load(filename)
+        set_firebird_env(configuration)
+        db_string = firebird_db_string(configuration)
+        Kernel.system "isql -i #{filename} #{db_string}"
+      end
+
+      private
+
+      def set_firebird_env(config)
+        ENV['ISC_USER']     = config['username'].to_s if config['username']
+        ENV['ISC_PASSWORD'] = config['password'].to_s if config['password']
+      end
+
+      def firebird_db_string(config)
+        FireRuby::Database.db_string_for(config.symbolize_keys)
+      end
+
+      def configuration
+        @configuration
+      end
+    end
+  end
+end

data/lib/active_record/tasks/mysql_database_tasks.rb

@@ -26,7 +26,9 @@ module ActiveRecord
           $stdout.print error.error
           establish_connection root_configuration_without_database
           connection.create_database configuration['database'], creation_options
-          connection.execute grant_statement.gsub(/\s+/, ' ').strip
+          if configuration['username'] != 'root'
+            connection.execute grant_statement.gsub(/\s+/, ' ').strip
+          end
           establish_connection configuration
         else
           $stderr.puts "Couldn't create database for #{configuration.inspect}, #{creation_options.inspect}"
@@ -57,7 +59,10 @@ module ActiveRecord
         args.concat(["--result-file", "#{filename}"])
         args.concat(["--no-data"])
         args.concat(["#{configuration['database']}"])
-        Kernel.system(*args)
+        unless Kernel.system(*args)
+          $stderr.puts "Could not dump the database structure. "\
+                       "Make sure `mysqldump` is in your PATH and check the command output for warnings."
+        end
       end
 
       def structure_load(filename)

data/lib/active_record/tasks/oracle_database_tasks.rb

@@ -0,0 +1,45 @@
+module ActiveRecord
+  module Tasks # :nodoc:
+    class OracleDatabaseTasks # :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
+        establish_connection(:test)
+        connection.structure_drop.split(";\n\n").each { |ddl| connection.execute(ddl) }
+      end
+
+      def charset
+        $stderr.puts 'sorry, your database adapter is not supported yet, feel free to submit a patch'
+      end
+
+      def structure_dump(filename)
+        establish_connection(configuration)
+        File.open(filename, "w:utf-8") { |f| f << connection.structure_dump }
+      end
+
+      def structure_load(filename)
+        establish_connection(configuration)
+        IO.read(filename).split(";\n\n").each { |ddl| connection.execute(ddl) }
+      end
+
+      private
+
+      def configuration
+        @configuration
+      end
+    end
+  end
+end