schema_plus 2.0.0.pre2 → 2.0.0.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7cafb63e57f4fa258f90908feff00e0e2b7dc0
-  data.tar.gz: 64c3b8e806e0ea043cf452f0b4e76cf29284d86c
+  metadata.gz: a80742e9f65732312bb80cd4adeb736affb95cd4
+  data.tar.gz: 89912fd50562d59cf9643e47b77a204b4444aa87
 SHA512:
-  metadata.gz: c30f67be8321db51e354b2f143dfd80b7f07fdb09f4dd61545e52e62d55586b8a91cc473d33dd55236c44a73155285681ab918fc36fc81038e3f285768eb84e7
-  data.tar.gz: 0fe7149f1e8dcf69ff94b80966da3227f765ca2df725883b40af5f224b39ebc58c443bdb95acc44c08bbf6c7324fb41b1e4634a111249a17359d40a828420706
+  metadata.gz: 29653f610f9e22ade23744e9ff9178111f3cb22afbe46c28cf557c38339e8498339ba719b525456d930361e5af4ff69bb7ab4112b627fc27d449360d9408e07f
+  data.tar.gz: 1ca7e5dfbc8be73af6535bc26c423541f8a3ab0d7ae49806d6d400bf1b4e0e84b05c63871c2c8b50c8b9e146d929cdc5e93a89e323ddc3ab47607c5ef28b9b3d

data/.travis.yml

@@ -8,9 +8,9 @@ rvm:
 - 1.9.3
 - 2.1.5
 gemfile:
-- gemfiles/rails-4.2/Gemfile.mysql2
-- gemfiles/rails-4.2/Gemfile.postgresql
-- gemfiles/rails-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.3'

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/README.md

@@ -68,8 +68,8 @@ SchemaPlus 2.x is tested against all combinations of:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **1.9.3** with rails **4.2**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.1.5** with rails **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **1.9.3** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -312,8 +312,8 @@ your schema.rb file by hand, and would like to take advantage of auto-creation
 of foreign key constraints, you can re-enable it:
 
     ActiveRecord::Schema.define do
-        SchemaPlus.config.foreign_keys.auto_create = true
-        SchemaPlus.config.foreign_keys.auto_index = true
+        SchemaPlusForeignKeys.config.auto_create = true
+        SchemaPlusForeignKeys.config.auto_index = true
 
         create_table ...etc...
     end

data/TODO.md

@@ -1,7 +1,6 @@
 ## ALL
 
 * ideally get rid of all uses of alias_method_chain outside schema_monkey (create middleware)
-* rename everything to schema_plus_* (except schema_monkey and schema_plus)
 
 ## schema_plus_tables
 
@@ -12,9 +11,7 @@
 ## schema_plus_index
 * remove index specs that are testing things now handled by AR.  (then see if coverage is still 100%)
 
-## schema_plus
-* deprecate config => SchemaForeignKeys config
-* move fk stuff into schema_foreign_keys
+## schema_plus_foreign_keys
 * add specs to cover the deprecations
 * just do fk enhancements rather than replace AR's add_foreign_key and remove_foreign_key methods and foreign key lookups
 
@@ -31,7 +28,7 @@
 * @dump should include the header for consistency
 * specs for schema_monkey
 * README to document it -- the conventions and internal API
-* (try it on AR 4.1?  nah)
+* pull out schema_monkey_rails into its own gem
 
 ## general
 * rename schema_pg_enum to just schema_enum?
@@ -40,12 +37,8 @@
 
 ## schema_dev things:
 
-* boilerplate in README regarding the schema_plus family?
-* boilerplate in README regarding test matrix?
-* default 'rspec'
+* boilerplate in README regarding installation, especially if schema_monkey_rails gets pulled out
 * don't bother changing ruby if it's the current version anyway.
-* rename 'refresh' to 'freshen'; get rid of the individual travis & gem commands
 * have a .schema_dev file with current settings
   * make it obvious and easy to override
   * auto update .gitignore to ignore it?
-* log files should go in log/ not in tmp/ (auto update .gitignore to ignore it?)

data/gemfiles/{rails-4.2 → activerecord-4.2}/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "rails", "~> 4.2.0"
+gem "activerecord", "~> 4.2.0"

data/lib/schema_plus.rb

@@ -1,133 +1,25 @@
-require 'active_record'
-require 'valuable'
-
-require 'schema_monkey'
+require 'schema_monkey_rails'
+require 'schema_plus_columns'
+require 'schema_plus_db_default'
+require 'schema_plus_default_expr'
+require 'schema_plus_enums'
+require 'schema_plus_foreign_keys'
 require 'schema_plus_indexes'
 require 'schema_plus_pg_indexes'
-
-require 'schema_column_plus'
-require 'schema_db_default'
-require 'schema_default_expr'
-require 'schema_pg_enums'
-require 'schema_views'
 require 'schema_plus_tables'
+require 'schema_plus_views'
 
-require 'schema_plus/version'
-require 'schema_plus/active_record/base'
-require 'schema_plus/active_record/connection_adapters/abstract_adapter'
-require 'schema_plus/active_record/connection_adapters/table_definition'
-require 'schema_plus/active_record/connection_adapters/schema_statements'
-require 'schema_plus/active_record/schema'
-require 'schema_plus/active_record/connection_adapters/foreign_key_definition'
-require 'schema_plus/active_record/migration/command_recorder'
-require 'schema_plus/middleware/dumper'
-require 'schema_plus/middleware/migration'
-require 'schema_plus/middleware/model'
+require_relative 'schema_plus/version'
 
 module SchemaPlus
-  module ActiveRecord
-
-    module ConnectionAdapters
-      autoload :Mysql2Adapter, 'schema_plus/active_record/connection_adapters/mysql2_adapter'
-      autoload :PostgresqlAdapter, 'schema_plus/active_record/connection_adapters/postgresql_adapter'
-      autoload :Sqlite3Adapter, 'schema_plus/active_record/connection_adapters/sqlite3_adapter'
+  class DeprecatedConfig
+    def foreign_keys
+      SchemaPlusForeignKeys.config
     end
   end
 
-  # This global configuation options for SchemaPlus.
-  # Set them in +config/initializers/schema_plus.rb+ using:
-  #
-  #    SchemaPlus.setup do |config|
-  #       ...
-  #    end
-  #
-  # The options are grouped into subsets based on area of functionality.
-  # See Config::ForeignKeys
-  #
-  class Config < Valuable
-
-    # This set of configuration options control SchemaPlus's foreign key
-    # constraint behavior.  Set them in
-    # +config/initializers/schema_plus.rb+ using:
-    #
-    #    SchemaPlus.setup do |config|
-    #       config.foreign_keys.auto_create = ...
-    #    end
-    #
-    class ForeignKeys < Valuable
-      ##
-      # :attr_accessor: auto_create
-      #
-      # Whether to automatically create foreign key constraints for columns
-      # suffixed with +_id+.  Boolean, default is +true+.
-      has_value :auto_create, :klass => :boolean, :default => true
-
-      ##
-      # :attr_accessor: auto_index
-      #
-      # Whether to automatically create indexes when creating foreign key constraints for columns.
-      # Boolean, default is +true+.
-      has_value :auto_index, :klass => :boolean, :default => true
-
-      ##
-      # :attr_accessor: on_update
-      #
-      # The default value for +:on_update+ when creating foreign key
-      # constraints for columns.  Valid values are as described in
-      # ForeignKeyDefinition, or +nil+ to let the database connection use
-      # its own default.  Default is +nil+.
-      has_value :on_update
-
-      ##
-      # :attr_accessor: on_delete
-      #
-      # The default value for +:on_delete+ when creating foreign key
-      # constraints for columns.  Valid values are as described in
-      # ForeignKeyDefinition, or +nil+ to let the database connection use
-      # its own default.  Default is +nil+.
-      has_value :on_delete
-    end
-    has_value :foreign_keys, :klass => ForeignKeys, :default => ForeignKeys.new
-
-    def dup #:nodoc:
-      self.class.new(Hash[attributes.collect{ |key, val| [key, Valuable === val ?  val.class.new(val.attributes) : val] }])
-    end
-
-    def update_attributes(opts)#:nodoc:
-      opts = opts.dup
-      opts.keys.each { |key| self.send(key).update_attributes(opts.delete(key)) if self.class.attributes.include? key and Hash === opts[key] }
-      super(opts)
-      self
-    end
-
-    def merge(opts)#:nodoc:
-      dup.update_attributes(opts)
-    end
-
-  end
-
-  # Returns the global configuration, i.e., the singleton instance of Config
-  def self.config
-    @config ||= Config.new
-  end
-
-  # Initialization block is passed a global Config instance that can be
-  # used to configure SchemaPlus behavior.  E.g., if you want to disable
-  # automation creation of foreign key constraints for columns name *_id,
-  # put the following in config/initializers/schema_plus.rb :
-  #
-  #    SchemaPlus.setup do |config|
-  #       config.foreign_keys.auto_create = false
-  #    end
-  #
   def self.setup # :yields: config
-    yield config
-  end
-
-  def self.insert #:nodoc:
-    SchemaMonkey.include_once ::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation, SchemaPlus::ActiveRecord::ConnectionAdapters::AbstractAdapter::VisitTableDefinition
+    ActiveSupport::Deprecation.warning "SchemaPlus.setup is deprecated.  Use SchemaPlusForeignKeys.setup instead"
+    yield DeprecatedConfig.new
   end
-
 end
-
-SchemaMonkey.register(SchemaPlus)

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre2"
+  VERSION = "2.0.0.pre3"
 end

data/lib/schema_plus_columns.rb

@@ -0,0 +1,7 @@
+require 'schema_monkey'
+require 'schema_plus_indexes'
+
+require_relative 'schema_plus_columns/active_record/connection_adapters/column'
+require_relative 'schema_plus_columns/middleware/model'
+
+SchemaMonkey.register(SchemaPlusColumns)

data/lib/{schema_column_plus → schema_plus_columns}/active_record/connection_adapters/column.rb

@@ -1,4 +1,4 @@
-module SchemaColumnPlus
+module SchemaPlusColumns
   module ActiveRecord
     module ConnectionAdapters
 

data/lib/schema_plus_columns/middleware/model.rb

@@ -0,0 +1,16 @@
+module SchemaPlusColumns
+  module Middleware
+    module Model
+
+      module Columns
+
+        def after(env)
+          env.columns.each do |column|
+            column.model = env.model
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/schema_plus_db_default.rb

@@ -0,0 +1,13 @@
+require 'schema_monkey'
+
+require_relative 'schema_plus_db_default/active_record/attribute'
+require_relative 'schema_plus_db_default/db_default'
+require_relative 'schema_plus_db_default/middleware'
+
+module SchemaPlusDbDefault
+  def self.insert
+    ::ActiveRecord.const_set(:DB_DEFAULT, SchemaPlusDbDefault::DB_DEFAULT)
+  end
+end
+
+SchemaMonkey.register(SchemaPlusDbDefault)

data/lib/{schema_db_default → schema_plus_db_default}/active_record/attribute.rb

@@ -1,16 +1,16 @@
-module SchemaDbDefault
+module SchemaPlusDbDefault
   module ActiveRecord
     module Attribute
       def self.included(base)
-        base.alias_method_chain :original_value, :schema_db_default
+        base.alias_method_chain :original_value, :schema_plus_db_default
       end
 
-      def original_value_with_schema_db_default
+      def original_value_with_schema_plus_db_default
         # prevent attempts to cast DB_DEFAULT to the attributes type.
         # We want to keep it as DB_DEFAULT so that we can handle it when
         # generating the sql.
         return DB_DEFAULT if value_before_type_cast.equal? DB_DEFAULT
-        original_value_without_schema_db_default
+        original_value_without_schema_plus_db_default
       end
 
     end

data/lib/{schema_db_default → schema_plus_db_default}/db_default.rb

@@ -1,6 +1,6 @@
 require 'singleton'
 
-module SchemaDbDefault
+module SchemaPlusDbDefault
   class DbDefault
     include Singleton
     def to_s

data/lib/schema_plus_db_default/middleware.rb

@@ -0,0 +1,30 @@
+module SchemaPlusDbDefault
+  module Middleware
+
+    module Query
+      module ExecCache
+
+        module Postgresql
+
+          # Middleware to replace each ActiveRecord::DB_DEFAULT with a literal
+          # DEFAULT in the sql string, for postgresql.  The underlying pg gem provides no
+          # way to bind a value that will replace $n with DEFAULT.
+          def before(env)
+            if env.binds.any?{ |col, val| val.equal? ::ActiveRecord::DB_DEFAULT}
+              j = 0
+              env.binds.each_with_index do |(col, val), i|
+                if val.equal? ::ActiveRecord::DB_DEFAULT
+                  env.sql = env.sql.sub(/\$#{i+1}/, 'DEFAULT')
+                else
+                  env.sql = env.sql.sub(/\$#{i+1}/, "$#{j+1}") if i != j
+                  j += 1
+                end
+              end
+              env.binds = env.binds.reject{|col, val| val.equal? ::ActiveRecord::DB_DEFAULT}
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/{schema_default_expr.rb → schema_plus_default_expr.rb}

@@ -1,8 +1,8 @@
 require 'schema_monkey'
 
-require_relative 'schema_default_expr/middleware'
+require_relative 'schema_plus_default_expr/middleware'
 
-module SchemaDefaultExpr
+module SchemaPlusDefaultExpr
   module ActiveRecord
     module ConnectionAdapters
       #
@@ -22,11 +22,11 @@ module SchemaDefaultExpr
       # Currently, the only function to support is :now, which should
       # return a DATETIME object for the current time.
       #
-      autoload :Mysql2Adapter, 'schema_default_expr/active_record/connection_adapters/mysql2_adapter'
-      autoload :PostgresqlAdapter, 'schema_default_expr/active_record/connection_adapters/postgresql_adapter'
-      autoload :Sqlite3Adapter, 'schema_default_expr/active_record/connection_adapters/sqlite3_adapter'
+      autoload :Mysql2Adapter, 'schema_plus_default_expr/active_record/connection_adapters/mysql2_adapter'
+      autoload :PostgresqlAdapter, 'schema_plus_default_expr/active_record/connection_adapters/postgresql_adapter'
+      autoload :Sqlite3Adapter, 'schema_plus_default_expr/active_record/connection_adapters/sqlite3_adapter'
     end
   end
 end
 
-SchemaMonkey.register(SchemaDefaultExpr)
+SchemaMonkey.register(SchemaPlusDefaultExpr)

data/lib/{schema_default_expr → schema_plus_default_expr}/active_record/connection_adapters/mysql2_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaDefaultExpr
+module SchemaPlusDefaultExpr
   module ActiveRecord
     module ConnectionAdapters
       module Mysql2Adapter

data/lib/{schema_default_expr → schema_plus_default_expr}/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaDefaultExpr
+module SchemaPlusDefaultExpr
   module ActiveRecord
     module ConnectionAdapters
       module PostgresqlAdapter

data/lib/{schema_default_expr → schema_plus_default_expr}/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-module SchemaDefaultExpr
+module SchemaPlusDefaultExpr
   module ActiveRecord
     module ConnectionAdapters
 

data/lib/{schema_default_expr → schema_plus_default_expr}/middleware.rb

@@ -1,14 +1,14 @@
-module SchemaDefaultExpr
+module SchemaPlusDefaultExpr
   module Middleware
-    def self.insert
-      SchemaMonkey::Middleware::Migration::ColumnOptionsSql.prepend DefaultExprOptions
-      SchemaMonkey::Middleware::Dumper::Table.append DumpDefaultExpressions
-    end
 
-    class DefaultExprOptions < ::SchemaMonkey::Middleware::Base
-      def call(env)
-        options = env.options
-        if env.caller.options_include_default?(options)
+    module Migration
+      module ColumnOptionsSql
+
+        # Add options for default expressions
+        def before(env)
+          options = env.options
+          return unless env.caller.options_include_default?(options)
+
           default = options[:default]
 
           if default.is_a? Hash and [[:expr], [:value]].include?(default.keys)
@@ -32,19 +32,21 @@ module SchemaDefaultExpr
             options[:default] = value
           end
         end
-        continue env
       end
     end
 
-    class DumpDefaultExpressions < SchemaMonkey::Middleware::Base
-      def call(env)
-        continue env
-        env.connection.columns(env.table.name).each do |column|
-          if !column.default_function.nil?
-            if col = env.table.columns.find{|col| col.name == column.name}
-              options = "default: { expr: #{column.default_function.inspect} }"
-              options += ", #{col.options}" unless col.options.blank?
-              col.options = options
+    module Dumper
+      module Table
+
+        # Emit default expression options in dump
+        def after(env)
+          env.connection.columns(env.table.name).each do |column|
+            if !column.default_function.nil?
+              if col = env.table.columns.find{|col| col.name == column.name}
+                options = "default: { expr: #{column.default_function.inspect} }"
+                options += ", #{col.options}" unless col.options.blank?
+                col.options = options
+              end
             end
           end
         end