schema_plus 2.0.0.pre3 → 2.0.0.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a80742e9f65732312bb80cd4adeb736affb95cd4
-  data.tar.gz: 89912fd50562d59cf9643e47b77a204b4444aa87
+  metadata.gz: 024ef569211e48b3ced76fe41a1cfca18fd22dc2
+  data.tar.gz: 1c72275c9cf049c750fc7304e9e3d597a08bd7cb
 SHA512:
-  metadata.gz: 29653f610f9e22ade23744e9ff9178111f3cb22afbe46c28cf557c38339e8498339ba719b525456d930361e5af4ff69bb7ab4112b627fc27d449360d9408e07f
-  data.tar.gz: 1ca7e5dfbc8be73af6535bc26c423541f8a3ab0d7ae49806d6d400bf1b4e0e84b05c63871c2c8b50c8b9e146d929cdc5e93a89e323ddc3ab47607c5ef28b9b3d
+  metadata.gz: 2819f118b3f9ef1254b62be21cf2052da8498ab74f235c8784a33e36455b096b6fcaa9e42a4d6e36573c3def094b16e52031ee83e2f856786e5d6bf0981e1bfe
+  data.tar.gz: 5b797d46390e0b26a9db544024ab029c4105ebc3230a6de0101c7294966a8996b9f4cede86be400598342c878b10b4ef63d81c101a85d0be39d2f80a8039673c

data/.travis.yml

@@ -5,7 +5,6 @@
 ---
 sudo: false
 rvm:
-- 1.9.3
 - 2.1.5
 gemfile:
 - gemfiles/activerecord-4.2/Gemfile.mysql2

data/README.md

@@ -15,6 +15,7 @@ Starting with version 2.0.0, schema_plus is a wrapper that pulls in a collection
 
 * [schema_plus_indexes](https://github.com/SchemaPlus/schema_plus_indexes) -- Convenience and consistency in defining and manipulating indexes
 * [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) -- Support for PostgreSQL index features: `case_insenstive`, `expression` and `operator_class`
+* [schema_plus_views](https://github.com/SchemaPlus/schema_plus_views) -- Support for creating and dropping views in migrations, and querying views
 
 See detailed documentation in each feature gem's README.  You can of course just use whichever of those gems you want individually, rather than this wrapper.
 
@@ -24,9 +25,10 @@ See detailed documentation in each feature gem's README.  You can of course just
 > * schema_plus_db_default -- Supports `update_attributes!(my_attr: ActiveRecord::DB_DEFAULT)` to set a column back to the default in the database schema. 
 > * schema_plus_default_expr -- Supports using SQL expressions for database default values
 > * schema_plus_enums -- Support for enum types
-> * schema_plus_foreign_keys -- Extends support for foreign keys, including automatic creation.
+> * schema_plus_foreign_keys -- Extends support for foreign keys
 > * schema_plus_tables -- Convenience and consistency in defining and manipulating tables
-> * schema_plus_views -- Adds support for creating and manipulating views
+> * schema_auto_foreign_keys -- Automatic foreign key creation
+
 >
 > The documentation for these features is at the end of this README
 >
@@ -68,7 +70,6 @@ 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 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 -->
@@ -200,31 +201,6 @@ with cascade-like behavior.
 
 SchemaPlus likewise extends `create_table ... force: true` to use `:cascade`
 
-### Views
-
-SchemaPlus provides support for creating and dropping views.  In a migration,
-a view can be created using a rails relation or literal sql:
-
-    create_view :posts_commented_by_staff,  Post.joins(comment: user).where(users: {role: 'staff'}).uniq
-    create_view :uncommented_posts,        "SELECT * FROM posts LEFT OUTER JOIN comments ON comments.post_id = posts.id WHERE comments.id IS NULL"
-
-And can be dropped:
-
-    drop_view :posts_commented_by_staff
-    drop_view :uncommented_posts, :if_exists => true
-
-ActiveRecord works with views the same as with ordinary tables.  That is, for
-the above views you can define
-
-    class PostCommentedByStaff < ActiveRecord::Base
-      table_name = "posts_commented_by_staff"
-    end
-
-    class UncommentedPost < ActiveRecord::Base
-    end
-
-Note: In PostgreSQL, all internal views (the ones with `pg_` prefix) will be skipped.
-
 ### Column Defaults: Expressions
 
 SchemaPlus allows defaults to be set using expressions or constant values:

data/TODO.md

@@ -11,9 +11,13 @@
 ## schema_plus_index
 * remove index specs that are testing things now handled by AR.  (then see if coverage is still 100%)
 
+## schema_plus_pg_index
+* pull over recent 1.8 fix for expression
+
 ## 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
+* pull over knojoot's failing spec & solution for circular fk dumping problems from 1.x branch.
 
 ## schema_monkey
 * consider automating the autoloads
@@ -28,7 +32,6 @@
 * @dump should include the header for consistency
 * specs for schema_monkey
 * README to document it -- the conventions and internal API
-* pull out schema_monkey_rails into its own gem
 
 ## general
 * rename schema_pg_enum to just schema_enum?
@@ -37,7 +40,7 @@
 
 ## schema_dev things:
 
-* boilerplate in README regarding installation, especially if schema_monkey_rails gets pulled out
+* figure out why Gemfile.local is being read twice?
 * don't bother changing ruby if it's the current version anyway.
 * have a .schema_dev file with current settings
   * make it obvious and easy to override

data/gemfiles/Gemfile.base

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-platform :ruby do
-    gem "byebug" if RUBY_VERSION > "2"
-end
-
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/lib/schema_plus.rb

@@ -7,7 +7,7 @@ require 'schema_plus_foreign_keys'
 require 'schema_plus_indexes'
 require 'schema_plus_pg_indexes'
 require 'schema_plus_tables'
-require 'schema_plus_views'
+require 'schema_plus/views'
 
 require_relative 'schema_plus/version'
 

data/lib/schema_plus/version.rb

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

data/lib/schema_plus_db_default.rb

@@ -4,10 +4,4 @@ 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_plus_db_default/active_record/attribute.rb

@@ -1,16 +1,13 @@
 module SchemaPlusDbDefault
   module ActiveRecord
     module Attribute
-      def self.included(base)
-        base.alias_method_chain :original_value, :schema_plus_db_default
-      end
 
-      def original_value_with_schema_plus_db_default
+      def original_value
         # 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_plus_db_default
+        super
       end
 
     end

data/lib/schema_plus_db_default/db_default.rb

@@ -15,3 +15,5 @@ module SchemaPlusDbDefault
   end
   DB_DEFAULT = DbDefault.instance
 end
+
+::ActiveRecord.const_set :DB_DEFAULT, SchemaPlusDbDefault::DB_DEFAULT

data/lib/schema_plus_db_default/middleware.rb

@@ -2,7 +2,7 @@ module SchemaPlusDbDefault
   module Middleware
 
     module Query
-      module ExecCache
+      module Exec
 
         module Postgresql
 

data/lib/schema_plus_default_expr.rb

@@ -1,6 +1,7 @@
 require 'schema_monkey'
 
 require_relative 'schema_plus_default_expr/middleware'
+require_relative 'schema_plus_default_expr/active_record/connection_adapters/column'
 
 module SchemaPlusDefaultExpr
   module ActiveRecord

data/lib/schema_plus_default_expr/active_record/connection_adapters/column.rb

@@ -0,0 +1,14 @@
+module SchemaPlusDefaultExpr
+  module ActiveRecord
+    module ConnectionAdapters
+      module Column
+        module Sqlite3
+          def default_function
+            @default_function ||= "(#{default})" if default =~ /DATETIME/
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus_default_expr/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,11 +1,7 @@
 module SchemaPlusDefaultExpr
   module ActiveRecord
     module ConnectionAdapters
-
       module Sqlite3Adapter
-        def self.included(base)
-          SchemaMonkey.include_once ::ActiveRecord::ConnectionAdapters::Column, SQLiteColumn
-        end
 
         def default_expr_valid?(expr)
           true # arbitrary sql is okay
@@ -18,18 +14,6 @@ module SchemaPlusDefaultExpr
           end
         end
       end
-
-      module SQLiteColumn
-
-        def self.included(base)
-          base.alias_method_chain :default_function, :sqlite3 if base.instance_methods.include? :default_function
-        end
-
-        def default_function_with_sqlite3
-          @default_function ||= "(#{default})" if default =~ /DATETIME/
-          default_function_without_sqlite3
-        end
-      end
     end
   end
 end

data/lib/schema_plus_default_expr/middleware.rb

@@ -1,15 +1,14 @@
 module SchemaPlusDefaultExpr
   module Middleware
 
-    module Migration
-      module ColumnOptionsSql
+    module Sql
+      module ColumnOptions
 
         # Add options for default expressions
         def before(env)
           options = env.options
-          return unless env.caller.options_include_default?(options)
 
-          default = options[:default]
+          return unless (default = options[:default])
 
           if default.is_a? Hash and [[:expr], [:value]].include?(default.keys)
             value = default[:value]

data/lib/schema_plus_enums/middleware.rb

@@ -2,7 +2,7 @@ module SchemaPlusEnums
   module Middleware
 
     module Dumper
-      module Extensions
+      module Initial
 
         module Postgresql
 
@@ -12,7 +12,7 @@ module SchemaPlusEnums
               params << values.map(&:inspect).join(', ')
               params << ":schema => #{schema.inspect}" if schema != 'public'
 
-              env.extensions << "create_enum #{params.join(', ')}"
+              env.initial << "create_enum #{params.join(', ')}"
             end
           end
         end

data/lib/schema_plus_foreign_keys.rb

@@ -5,13 +5,13 @@ require 'schema_plus_foreign_keys/version'
 require 'schema_plus_foreign_keys/active_record/base'
 require 'schema_plus_foreign_keys/active_record/connection_adapters/abstract_adapter'
 require 'schema_plus_foreign_keys/active_record/connection_adapters/table_definition'
-require 'schema_plus_foreign_keys/active_record/connection_adapters/schema_statements'
 require 'schema_plus_foreign_keys/active_record/schema'
 require 'schema_plus_foreign_keys/active_record/connection_adapters/foreign_key_definition'
 require 'schema_plus_foreign_keys/active_record/migration/command_recorder'
 require 'schema_plus_foreign_keys/middleware/dumper'
 require 'schema_plus_foreign_keys/middleware/migration'
 require 'schema_plus_foreign_keys/middleware/model'
+require 'schema_plus_foreign_keys/middleware/sql'
 
 module SchemaPlusForeignKeys
   module ActiveRecord
@@ -87,10 +87,6 @@ module SchemaPlusForeignKeys
     yield config
   end
 
-  def self.insert #:nodoc:
-    SchemaMonkey.include_once ::ActiveRecord::ConnectionAdapters::AbstractAdapter::SchemaCreation, SchemaPlusForeignKeys::ActiveRecord::ConnectionAdapters::AbstractAdapter::VisitTableDefinition
-  end
-
 end
 
 SchemaMonkey.register(SchemaPlusForeignKeys)

data/lib/schema_plus_foreign_keys/active_record/base.rb

@@ -5,10 +5,6 @@ module SchemaPlusForeignKeys
     # SchemaPlusForeignKeys adds several methods to ActiveRecord::Base
     #
     module Base
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
-
       module ClassMethods #:nodoc:
 
         public

data/lib/schema_plus_foreign_keys/active_record/connection_adapters/abstract_adapter.rb

@@ -12,6 +12,19 @@ module SchemaPlusForeignKeys
       #
       module AbstractAdapter
 
+        def create_table(table, options = {})
+          options = options.dup
+          config_options = options.delete(:foreign_keys) || {}
+
+          # override rails' :force to cascade
+          drop_table(table, if_exists: true, cascade: true) if options.delete(:force)
+
+          super(table, options) do |table_definition|
+            table_definition.schema_plus_config = SchemaPlusForeignKeys.config.merge(config_options)
+            yield table_definition if block_given?
+          end
+        end
+
         # Define a foreign key constraint.  Valid options are :on_update,
         # :on_delete, and :deferrable, with values as described at
         # ConnectionAdapters::ForeignKeyDefinition
@@ -147,25 +160,6 @@ module SchemaPlusForeignKeys
           end
         end
 
-        module VisitTableDefinition
-          def self.included(base) #:nodoc:
-            base.alias_method_chain :visit_TableDefinition, :schema_plus_foreign_keys
-          end
-
-          def visit_TableDefinition_with_schema_plus_foreign_keys(o) #:nodoc:
-            create_sql = visit_TableDefinition_without_schema_plus_foreign_keys(o)
-            last_chunk = ") #{o.options}"
-
-            unless create_sql.end_with?(last_chunk)
-              raise "Internal Error: Can't find '#{last_chunk}' at end of '#{create_sql}' - Rails internals have changed!"
-            end
-
-            unless o.foreign_keys.empty?
-              create_sql[create_sql.size - last_chunk.size, 0] = ', ' + o.foreign_keys.map(&:to_sql) * ', '
-            end
-            create_sql
-          end
-        end
 
         #####################################################################
         #

data/lib/schema_plus_foreign_keys/active_record/connection_adapters/foreign_key_definition.rb

@@ -17,12 +17,6 @@ module SchemaPlusForeignKeys
       #   :initially_deferred
       module ForeignKeyDefinition
 
-        def self.included(base)
-          base.class_eval do
-            alias_method_chain :initialize, :schema_plus_foreign_keys
-          end
-        end
-
         def column_names
           ActiveSupport::Deprecation.warn "ForeignKeyDefinition#column_names is depcreated, use Array.wrap(column)"
           Array.wrap(column)
@@ -46,7 +40,7 @@ module SchemaPlusForeignKeys
         ACTIONS = { :cascade => "CASCADE", :restrict => "RESTRICT", :nullify => "SET NULL", :set_default => "SET DEFAULT", :no_action => "NO ACTION" }.freeze
         ACTION_LOOKUP = ACTIONS.invert.freeze
 
-        def initialize_with_schema_plus_foreign_keys(from_table, to_table, options={})
+        def initialize(from_table, to_table, options={})
           [:on_update, :on_delete].each do |key|
             if options[key] == :set_null
               require 'byebug' ; byebug
@@ -55,7 +49,8 @@ module SchemaPlusForeignKeys
             end
           end
 
-          initialize_without_schema_plus_foreign_keys(from_table, to_table, options)
+          super from_table, to_table, options
+
           if column.is_a?(Array) and column.length == 1
             options[:column] = column[0]
           end
@@ -77,24 +72,23 @@ module SchemaPlusForeignKeys
         end
 
         # Dumps a definition of foreign key.
-        def to_dump(opts={})
-          opts = opts.keyword_args(:column, :inline)
+        def to_dump(column: nil, inline: nil)
           dump = case 
-                 when opts.column then "foreign_key: {references:"
-                 when opts.inline then "t.foreign_key"
+                 when column then "foreign_key: {references:"
+                 when inline then "t.foreign_key"
                  else "add_foreign_key #{from_table.inspect},"
                  end
           dump << " #{to_table.inspect}"
 
           val_or_array = -> val { val.is_a?(Array) ? "[#{val.map(&:inspect).join(', ')}]" : val.inspect }
 
-          dump << ", column: #{val_or_array.call column}" unless opts.column
-          dump << ", primary_key: #{val_or_array.call column}" if custom_primary_key?
+          dump << ", column: #{val_or_array.call self.column}" unless column
+          dump << ", primary_key: #{val_or_array.call self.column}" if custom_primary_key?
           dump << ", name: #{name.inspect}" if name
           dump << ", on_update: #{on_update.inspect}" if on_update
           dump << ", on_delete: #{on_delete.inspect}" if on_delete
           dump << ", deferrable: #{deferrable.inspect}" if deferrable
-          dump << "}" if opts.column
+          dump << "}" if column
           dump
         end
 

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

@@ -7,23 +7,15 @@ module SchemaPlusForeignKeys
 
         #:enddoc:
 
-        def self.included(base)
-          base.class_eval do
-            alias_method_chain :remove_column, :schema_plus_foreign_keys
-            alias_method_chain :rename_table, :schema_plus_foreign_keys
-          end
-          ::ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::SchemaCreation.send(:include, SchemaPlusForeignKeys::ActiveRecord::ConnectionAdapters::AbstractAdapter::VisitTableDefinition)
-        end
-
-        def remove_column_with_schema_plus_foreign_keys(table_name, column_name, type=nil, options={})
+        def remove_column(table_name, column_name, type=nil, options={})
           foreign_keys(table_name).select { |foreign_key| Array.wrap(foreign_key.column).include?(column_name.to_s) }.each do |foreign_key|
             remove_foreign_key(table_name, name: foreign_key.name)
           end
-          remove_column_without_schema_plus_foreign_keys(table_name, column_name, type, options)
+          super table_name, column_name, type, options
         end
 
-        def rename_table_with_schema_plus_foreign_keys(oldname, newname)
-          rename_table_without_schema_plus_foreign_keys(oldname, newname)
+        def rename_table(oldname, newname)
+          super
           rename_foreign_keys(oldname, newname)
         end