schema_plus 2.0.0.pre1 → 2.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090fdf5adb8715e2bb78a10c58b7f5f5d4e9b219
-  data.tar.gz: 8950e08cdd6cbf912cb8508e40ce4b2449f914a0
+  metadata.gz: 7b7cafb63e57f4fa258f90908feff00e0e2b7dc0
+  data.tar.gz: 64c3b8e806e0ea043cf452f0b4e76cf29284d86c
 SHA512:
-  metadata.gz: fcd75a62438cf8a1feb618f37a2e7e99bdc30a6691bf0131908978af5e8410ae330f537692f97e64b1a3f10f9588faeafc6c16860213d1d9dafeb9ac1bef7395
-  data.tar.gz: 6088b9ddf4b227aa4fa021c3ebed7be1369c881efcc392a5942d692a82ca5ba8e5058d35387d1794afecbde9e4ed1b143caa435aab7f09cff5d47fb81ec502af
+  metadata.gz: c30f67be8321db51e354b2f143dfd80b7f07fdb09f4dd61545e52e62d55586b8a91cc473d33dd55236c44a73155285681ab918fc36fc81038e3f285768eb84e7
+  data.tar.gz: 0fe7149f1e8dcf69ff94b80966da3227f765ca2df725883b40af5f224b39ebc58c443bdb95acc44c08bbf6c7324fb41b1e4634a111249a17359d40a828420706

data/README.md

@@ -13,12 +13,12 @@
 
 Starting with version 2.0.0, schema_plus is a wrapper that pulls in a collection of individual feature gems:
 
-* [schema_plus_indexes](https://github.com/SchemaPlus/schema_plus_indexes) -- Convenience and consistency in defining and manipulting indexes
+* [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`
 
 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.
 
-> **IN PROGRESS:** In the prerelease versions of SchemaPlus 2.0, more feature gems have yet to be stripped out, and the code is still in the body of schema_plus.  Anticipated features gems include:
+> **IN PROGRESS:** In the prerelease versions of SchemaPlus 2.0, more feature gems have yet to be cleaned up and stripped out, and their code is still in the body of schema_plus.  Anticipated features gems include:
 > 
 > * schema_plus_columns -- Extra Column features, including `column.indexes` and `column.unique?`
 > * schema_plus_db_default -- Supports `update_attributes!(my_attr: ActiveRecord::DB_DEFAULT)` to set a column back to the default in the database schema. 
@@ -29,6 +29,8 @@ See detailed documentation in each feature gem's README.  You can of course just
 > * schema_plus_views -- Adds support for creating and manipulating views
 >
 > The documentation for these features is at the end of this README
+>
+> If you'd like to follow or contribute to the discussion of this refactoring, take a look at issue SchemaPlus/schema_plus/197
 
 
 ## Upgrading from SchemaPlus 1.8.x
@@ -38,9 +40,9 @@ SchemaPlus 2.0.x intends to be a completely backwards-compatible drop-in replace
 If you find any incompatibilities, please report an issue!
 
 ### Deprecations
-In cases where rails 4.2 has introduced features previously supported only by SchemaPlus, but using different names, SchemaPlus 2.0 now issues deprecation warnings in favor of the rails form.  The complete list of deprecations:
+In cases where rails 4.2 has introduced features previously supported only by SchemaPlus, but using different names, the SchemaPlus 2.0 family of gems now issue deprecation warnings in favor of the rails form.  The complete list of deprecations:
 
-* Index definitions deprecate these options:
+* Index definition deprecates these options:
   * `:conditions` => `:where`
   * `:kind` => `:using`
 
@@ -52,13 +54,13 @@ In cases where rails 4.2 has introduced features previously supported only by Sc
 
 * `ForeignKeyDefinition` deprecates accessors: 
   * `#table_name` in favor of `#from_table`
-  * `#column_names` in favor of `#column`
+  * `#column_names` in favor of `Array.wrap(#column)`
   * `#references_column_names` in favor of `#primary_key`
   * `#references_table_name in favor of `#to_table`
 
 * `IndexDefinition` deprecates accessors: 
   * `#conditions` in favor of `#where`
-  * `#kind` in favor of `#using`
+  * `#kind` in favor of `#using.to_s`
 
 ## Compatibility
 
@@ -90,7 +92,7 @@ or in a Gemfile
 
 *   SchemaPlus was created in 2011 by [@mlomnicki](https://github.com/mlomnicki) and [@ronen](https://github.com/ronen)
 
-*   And [lots of contributors](https://github.com/SchemaPlus/schema_plus/graphs/contributors) since then
+*   And [lots of contributors](https://github.com/SchemaPlus/schema_plus/graphs/contributors) since then.
 
 ## Development & Testing
 

data/lib/schema_default_expr.rb

@@ -22,7 +22,7 @@ module SchemaDefaultExpr
       # Currently, the only function to support is :now, which should
       # return a DATETIME object for the current time.
       #
-      autoload :MysqlAdapter, 'schema_default_expr/active_record/connection_adapters/mysql_adapter'
+      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'
     end

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

@@ -1,7 +1,7 @@
 module SchemaDefaultExpr
   module ActiveRecord
     module ConnectionAdapters
-      module MysqlAdapter
+      module Mysql2Adapter
         def default_expr_valid?(expr)
           false # only the TIMESTAMP column accepts SQL column defaults and rails uses DATETIME
         end

data/lib/schema_plus.rb

@@ -28,7 +28,7 @@ module SchemaPlus
   module ActiveRecord
 
     module ConnectionAdapters
-      autoload :MysqlAdapter, 'schema_plus/active_record/connection_adapters/mysql_adapter'
+      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'
     end

data/lib/schema_plus/active_record/connection_adapters/{mysql_adapter.rb → mysql2_adapter.rb}

@@ -3,7 +3,7 @@ module SchemaPlus
     module ConnectionAdapters
       # SchemaPlus includes a MySQL implementation of the AbstractAdapter
       # extensions.
-      module MysqlAdapter
+      module Mysql2Adapter
 
         #:enddoc:
 

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

@@ -74,6 +74,9 @@ module SchemaPlus::ActiveRecord::ConnectionAdapters
     def foreign_key(*args) # (column_names, to_table, primary_key=nil, options=nil)
       options = args.extract_options!
       case args.length
+      when 1
+        to_table = args[0]
+        column_names = "#{to_table.to_s.singularize}_id"
       when 2
         column_names, to_table = args
       when 3

data/lib/schema_plus/version.rb

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

data/lib/schema_plus_tables.rb

@@ -5,7 +5,7 @@ require_relative 'schema_plus_tables/active_record/connection_adapters/abstract_
 module SchemaPlusTables
   module ActiveRecord
     module ConnectionAdapters
-      autoload :MysqlAdapter, 'schema_plus_tables/active_record/connection_adapters/mysql_adapter'
+      autoload :Mysql2Adapter, 'schema_plus_tables/active_record/connection_adapters/mysql2_adapter'
       autoload :PostgresqlAdapter, 'schema_plus_tables/active_record/connection_adapters/postgresql_adapter'
       autoload :Sqlite3Adapter, 'schema_plus_tables/active_record/connection_adapters/sqlite3_adapter'
     end

data/lib/schema_plus_tables/active_record/connection_adapters/{mysql_adapter.rb → mysql2_adapter.rb}

@@ -1,7 +1,7 @@
 module SchemaPlusTables
   module ActiveRecord
     module ConnectionAdapters
-      module MysqlAdapter
+      module Mysql2Adapter
         
         # implement cascade by removing foreign keys
         def drop_table(name, options={})

data/lib/schema_views.rb

@@ -6,7 +6,7 @@ require_relative 'schema_views/middleware'
 module SchemaViews
   module ActiveRecord
     module ConnectionAdapters
-      autoload :MysqlAdapter, 'schema_views/active_record/connection_adapters/mysql_adapter'
+      autoload :Mysql2Adapter, 'schema_views/active_record/connection_adapters/mysql2_adapter'
       autoload :PostgresqlAdapter, 'schema_views/active_record/connection_adapters/postgresql_adapter'
       autoload :Sqlite3Adapter, 'schema_views/active_record/connection_adapters/sqlite3_adapter'
     end

data/lib/schema_views/active_record/connection_adapters/{mysql_adapter.rb → mysql2_adapter.rb}

@@ -1,7 +1,7 @@
 module SchemaViews
   module ActiveRecord
     module ConnectionAdapters
-      module MysqlAdapter
+      module Mysql2Adapter
 
         def views(name = nil)
           views = []

data/schema_plus.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "activerecord", ">= 3.2", "< 4.3"
+  s.add_dependency "activerecord", "~> 4.2"
   s.add_dependency "valuable"
-  s.add_dependency "schema_monkey", "~> 0.1"
+  s.add_dependency "schema_monkey", "~> 0.4"
   s.add_dependency "schema_plus_indexes", "~> 0.1"
   s.add_dependency "schema_plus_pg_indexes", "~> 0.1"
 

data/spec/schema_column_plus/column_spec.rb

@@ -128,6 +128,18 @@ describe "Column" do
 
   end
 
+  context "Postgresql array", :postgresql => :only do
+
+    before(:each) do
+      create_table(User, :alpha => { :default => [], :array => true })
+    end
+
+    it "respects array: true" do
+      column = User.columns.find(&its.name == "alpha")
+      expect(column.array).to be_truthy
+    end
+  end
+
   protected
 
   def create_table(model, columns_with_options)

data/spec/schema_spec.rb

@@ -31,9 +31,8 @@ describe ActiveRecord::Schema do
       expect(connection.tables.collect { |table| connection.foreign_keys(table) }.flatten.size).to eq(2)
     end
 
-  end
-
   protected
+
   def do_schema
     define_schema do
 
@@ -54,6 +53,29 @@ describe ActiveRecord::Schema do
     end
   end
 
+  end
+
+  it "handles explicit foreign keys" do
+    expect {
+      with_auto_create(false) do
+        define_schema do
+          create_table :users, :force => :cascade do
+          end
+
+          create_table :posts, :force => :cascade do |t|
+            t.integer :user_id
+            t.foreign_key :users
+          end
+        end
+      end
+    }.not_to raise_error
+    expect(connection.foreign_keys("posts").first.to_table).to eq "users"
+  end
+
+
+  protected
+
+
   def with_auto_index(value = true)
     old_value = SchemaPlus.config.foreign_keys.auto_index
     SchemaPlus.config.foreign_keys.auto_index = value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -51,14 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +196,6 @@ files:
 - gemfiles/rails-4.2/Gemfile.postgresql
 - gemfiles/rails-4.2/Gemfile.sqlite3
 - init.rb
-- lib/rails/tasks/database.rake
 - lib/schema_column_plus.rb
 - lib/schema_column_plus/active_record/connection_adapters/column.rb
 - lib/schema_column_plus/middleware/model.rb
@@ -211,7 +204,7 @@ files:
 - lib/schema_db_default/db_default.rb
 - lib/schema_db_default/middleware.rb
 - lib/schema_default_expr.rb
-- lib/schema_default_expr/active_record/connection_adapters/mysql_adapter.rb
+- lib/schema_default_expr/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_default_expr/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_default_expr/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_default_expr/middleware.rb
@@ -222,7 +215,7 @@ files:
 - lib/schema_plus/active_record/base.rb
 - lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb
 - lib/schema_plus/active_record/connection_adapters/foreign_key_definition.rb
-- lib/schema_plus/active_record/connection_adapters/mysql_adapter.rb
+- lib/schema_plus/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus/active_record/connection_adapters/schema_statements.rb
 - lib/schema_plus/active_record/connection_adapters/sqlite3_adapter.rb
@@ -235,12 +228,12 @@ files:
 - lib/schema_plus/version.rb
 - lib/schema_plus_tables.rb
 - lib/schema_plus_tables/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus_tables/active_record/connection_adapters/mysql_adapter.rb
+- lib/schema_plus_tables/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus_tables/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_views.rb
 - lib/schema_views/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_views/active_record/connection_adapters/mysql_adapter.rb
+- lib/schema_views/active_record/connection_adapters/mysql2_adapter.rb
 - lib/schema_views/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_views/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_views/middleware.rb

data/lib/rails/tasks/database.rake

@@ -1,5 +0,0 @@
-namespace :schema_plus do
-  task :load do
-    SchemaPlus.insert
-  end
-end