schema_plus 2.0.0.pre9 → 2.0.0.pre10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e2c68d4c34a1a67e9dd384a88b39a1c51ac28b
-  data.tar.gz: 2d6b58497e571c08e38ce563a74f56b5d1f9a5d3
+  metadata.gz: 0c5aee9479eef0756986536130a26f38f23c4a87
+  data.tar.gz: 4447fc06494c1646f8587f11882751618fc9f4cd
 SHA512:
-  metadata.gz: 70b083aec779efb9afebd741e24ef825d99f0c4dfdd89e416cd3cd4d61f38238a40541e8182dae1de155a96cb5abdd71082666024c145600b391dfc5169cbea5
-  data.tar.gz: fa3810d8ba0c11444928631f3d285303c76f1b8bfe272c495cdf82bff2e84285253159d3e51a34c861f0d4adfed5e922fc67ef65eead4b682d83d6397600e97d
+  metadata.gz: 235927976009fd939faa6180f2465a12aa03db03263f310428c94e2d23bb3ba9c86e9343cc2dcdd4a12bead0ed058f9b84ce61d13e9ec06f1cdda719e768b5f5
+  data.tar.gz: fb6d3574efc491cdf8d4e344a0c554f051ee072fae6a3050ecdc5e32cb2021daec0acf8076f86d43aec0ccf3ae75c3558ef7a451142414886e6b5303512229d1

data/.travis.yml

@@ -7,9 +7,12 @@ sudo: false
 rvm:
 - 2.1.5
 gemfile:
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.0/Gemfile.mysql2
+- gemfiles/activerecord-4.2.0/Gemfile.postgresql
+- gemfiles/activerecord-4.2.0/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.1/Gemfile.mysql2
+- gemfiles/activerecord-4.2.1/Gemfile.postgresql
+- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.3'

data/README.md

@@ -81,7 +81,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 **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.5** with activerecord **4.2.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.1.5** with activerecord **4.2.1**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -227,26 +228,6 @@ Note that after updating, you would need to reload a record to replace
 Note also that Sqlite3 does not support `ActiveRecord::DB_DEFAULT`; attempting
 to use it will raise `ActiveRecord::StatementInvalid`
 
-### Enums (PostgreSQL only)
-
-SchemaPlus provides support for creating, altering and dropping enums. In a migration,
-a enum can be created:
-
-    create_enum :color, :red, :green, :blue # default schema is 'public'
-    create_enum :cmyk, :cyan, :magenta, :yellow, :black, :schema => 'color'
-
-And can be altered: (added a new value)
-
-    alter_enum :color, :black
-    alter_enum :color, :purple, :after => 'red'
-    alter_enum :color, :pink, :before => 'purple'
-    alter_enum :color, :white, :schema => 'public'
-
-Finally, a enum can be dropped:
-
-    drop_enum :color
-    drop_enum :cmyk, :schema => 'color'
-
 ### Schema Dump and Load (schema.rb)
 
 When dumping `schema.rb`, SchemaPlus orders the views and tables in the schema

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

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

data/gemfiles/activerecord-4.2.1/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "4.2.1"

data/gemfiles/activerecord-4.2.1/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-4.2.1/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-4.2.1/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/foreign_key_definition.rb

@@ -43,7 +43,6 @@ module SchemaPlus::ForeignKeys
         def initialize(from_table, to_table, options={})
           [:on_update, :on_delete].each do |key|
             if options[key] == :set_null
-              require 'byebug' ; byebug
               ActiveSupport::Deprecation.warn ":set_null value for #{key} is deprecated.  use :nullify instead"
               options[key] = :nullify
             end

data/lib/schema_plus/foreign_keys/active_record/connection_adapters/table_definition.rb

@@ -69,7 +69,7 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
 
     def foreign_keys
       @foreign_keys ||= []
-    end
+    end if ActiveRecord.version == Gem::Version.new("4.2.0")
 
     def foreign_key(*args) # (column_names, to_table, primary_key=nil, options=nil)
       options = args.extract_options!
@@ -89,7 +89,11 @@ module SchemaPlus::ForeignKeys::ActiveRecord::ConnectionAdapters
 
       options.merge!(:column => column_names)
       options.reverse_merge!(:name => ForeignKeyDefinition.default_name(self.name, column_names))
-      foreign_keys << ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(self.name, AbstractAdapter.proper_table_name(to_table), options)
+      fk = ::ActiveRecord::ConnectionAdapters::ForeignKeyDefinition.new(self.name, AbstractAdapter.proper_table_name(to_table), options)
+      case ::ActiveRecord.version
+      when Gem::Version.new("4.2.0") then foreign_keys << fk
+      else foreign_keys[fk.to_table] = fk
+      end
       self
     end
 

data/lib/schema_plus/foreign_keys/middleware/migration.rb

@@ -64,7 +64,10 @@ module SchemaPlus::ForeignKeys
           # usurp index creation from AR.  That's necessary to make
           # auto_index work properly
           index = options.delete(:index) unless is_polymorphic
-          options[:foreign_key] = false if is_reference
+          if is_reference
+            options[:foreign_key] = false
+            options[:_is_reference] = true
+          end
 
           yield env
 
@@ -145,7 +148,9 @@ module SchemaPlus::ForeignKeys
           return :none if options[:foreign_key] == false
 
           args = options[:foreign_key]
-          args ||= {} if config.auto_create? and column_name =~ /_id$/
+          auto = config.auto_create?
+          auto = false if options[:_is_reference] and env.type != :reference # this is a nested call to column() from with reference(); suppress auto-fk
+          args ||= {} if auto and column_name =~ /_id$/
 
           return nil if args.nil?
 

data/lib/schema_plus/foreign_keys/middleware/sql.rb

@@ -3,7 +3,16 @@ module SchemaPlus::ForeignKeys
     module Sql
       module Table
         def after(env)
-          env.sql.body = ([env.sql.body] + env.table_definition.foreign_keys.map(&:to_sql)).join(', ')
+          foreign_keys = case ::ActiveRecord.version
+                         when Gem::Version.new("4.2.0") then env.table_definition.foreign_keys
+                         else env.table_definition.foreign_keys.values
+                         end
+
+          # create foreign key constraints inline in table definition
+          env.sql.body = ([env.sql.body] + foreign_keys.map(&:to_sql)).join(', ')
+ 
+          # prevents AR >= 4.2.1 from emitting add_foreign_key after the table
+          env.table_definition.foreign_keys.clear
         end
       end
     end

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre9"
+  VERSION = "2.0.0.pre10"
 end

data/schema_dev.yml

@@ -1,7 +1,8 @@
 ruby:
     - 2.1.5
 activerecord:
-    - 4.2
+    - 4.2.0
+    - 4.2.1
 db:
     - mysql2
     - sqlite3

data/schema_plus.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "schema_plus_tables", "~> 0.1"
   gem.add_dependency "schema_plus_views", "~> 0.1"
 
-  gem.add_development_dependency "schema_dev", "~> 3.1"
+  gem.add_development_dependency "schema_dev", "~> 3.4"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3.0"
   gem.add_development_dependency "rdoc"

data/spec/spec_helper.rb

@@ -59,5 +59,5 @@ def remove_all_models
     end
   end
 
-SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"
+SimpleCov.command_name "[ruby#{RUBY_VERSION}-activerecord#{::ActiveRecord::VERSION::STRING}-#{ActiveRecord::Base.connection.adapter_name}]"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre9
+  version: 2.0.0.pre10
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -169,14 +169,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -267,10 +267,14 @@ files:
 - Rakefile
 - TODO.md
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.mysql2
-- gemfiles/activerecord-4.2/Gemfile.postgresql
-- gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.0/Gemfile.base
+- gemfiles/activerecord-4.2.0/Gemfile.mysql2
+- gemfiles/activerecord-4.2.0/Gemfile.postgresql
+- gemfiles/activerecord-4.2.0/Gemfile.sqlite3
+- gemfiles/activerecord-4.2.1/Gemfile.base
+- gemfiles/activerecord-4.2.1/Gemfile.mysql2
+- gemfiles/activerecord-4.2.1/Gemfile.postgresql
+- gemfiles/activerecord-4.2.1/Gemfile.sqlite3
 - lib/schema_plus.rb
 - lib/schema_plus/db_default.rb
 - lib/schema_plus/db_default/active_record/attribute.rb