schema_plus 2.0.0.pre10 → 2.0.0.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c5aee9479eef0756986536130a26f38f23c4a87
-  data.tar.gz: 4447fc06494c1646f8587f11882751618fc9f4cd
+  metadata.gz: 18fb53e5cdb54375f9ebd2f978833266b7b61f38
+  data.tar.gz: c2b17dd83a109cdb32f10c7883447f14b85f9ffd
 SHA512:
-  metadata.gz: 235927976009fd939faa6180f2465a12aa03db03263f310428c94e2d23bb3ba9c86e9343cc2dcdd4a12bead0ed058f9b84ce61d13e9ec06f1cdda719e768b5f5
-  data.tar.gz: fb6d3574efc491cdf8d4e344a0c554f051ee072fae6a3050ecdc5e32cb2021daec0acf8076f86d43aec0ccf3ae75c3558ef7a451142414886e6b5303512229d1
+  metadata.gz: 95c9f95715df96aca11804ab355833bfd61d624e5bf8d493ed00d3dc265dd06b089921b0aaeb745e6c209bc8594e72b3b7599dfa668d90a2a5e1670139aea22e
+  data.tar.gz: 7519c544165bf8324754dee3e5249b99bf9943d7734e8dc976f06813f8bf89a1f32ed90f5861567d09d72c4f2f4f035469f564d28a03772760c91fec3289be6e

data/README.md

@@ -1,24 +1,18 @@
 
-> ## This is the README for SchemaPlus 2.0.0 (prelease)
-> which is under development in the master branch, and which supports Rails >= 4.2.  For info about the stable 1.x releases which support Rails 3.1, 4.0, 4.1, and 4.2, see the [schema_plus 1.x](https://github.com/SchemaPlus/schema_plus/tree/1.x) branch
 
----
 
-[![Gem Version](https://badge.fury.io/rb/schema_plus.svg)](http://badge.fury.io/rb/schema_plus)
-[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus.svg)](http://travis-ci.org/SchemaPlus/schema_plus)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus.svg)](https://coveralls.io/r/SchemaPlus/schema_plus)
-[![Dependency Status](https://gemnasium.com/lomba/schema_plus.svg)](https://gemnasium.com/SchemaPlus/schema_plus)
+# SchemaPlus family
 
-# SchemaPlus
+The SchemaPlus family of gems provide various extensions and enhancements to ActiveRecord.  
 
-The SchemaPlus family of gems provide various extensions and enhancements to ActiveRecord.  Listed alphabetically:
+Listed alphabetically:
 
 Gem | Description | Included In `schema_plus` gem?
 ----| ----------- |:------------------------------:
 [schema_associations](https://github.com/SchemaPlus/schema_associations) | Automatically defines model associations based on foreign key relations |
 <p style="color:grey">schema_auto_foreign_keys</p> | Automatically creates foreign keys on referencing columns | Y
 [schema_plus_columns](https://github.com/SchemaPlus/schema_plus_columns) | Column attributes including `column.indexes` and `column.unique?` | Y
-<p style="color:grey">schema_plus_db_default</p> | Use `ActiveRecord::DB_DEFAULT` to set an attribute to the database default | Y
+[schema_plus_db_default](https://github.com/SchemaPlus/schema_plus_db_default) | Use `ActiveRecord::DB_DEFAULT` to set an attribute to the database default | Y
 <p style="color:grey">schema_plus_default_expr</p> | Use SQL expressions for database default values | Y
 [schema_plus_enums](https://github.com/SchemaPlus/schema_plus_enums) | Define enum types in migrations | Y
 <p style="color:grey">schema_plus_foreign_keys | Extended support for foreign keys, including creation as column options, `:deferrable`, and SQLite3 support | Y
@@ -32,10 +26,22 @@ See detailed documentation in each gem's README.
 
 *Is there some other capability you wish SchemaPlus had a gem for?*  Open an issue here. Or try implementing it yourself -- creating ActiveRecord extensions is easy and fun using SchemaPlus's tools [schema_monkey](https://github.com/SchemaPlus/schema_monkey) and [schema_plus_core](https://github.com/SchemaPlus/schema_plus_core)!!
 
+---
+# The `schema_plus` gem
+
+[![Gem Version](https://badge.fury.io/rb/schema_plus.svg)](http://badge.fury.io/rb/schema_plus)
+[![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus.svg)](http://travis-ci.org/SchemaPlus/schema_plus)
+[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus.svg)](https://coveralls.io/r/SchemaPlus/schema_plus)
+[![Dependency Status](https://gemnasium.com/lomba/schema_plus.svg)](https://gemnasium.com/SchemaPlus/schema_plus)
+
+
+> ## This is the README for schema_plus 2.0.0 (prelease)
+> which is under development in the master branch, and which supports Rails >= 4.2.  For info about the stable 1.x releases which support Rails 3.1, 4.0, 4.1, and 4.2.0, see the [schema_plus 1.x](https://github.com/SchemaPlus/schema_plus/tree/1.x) branch
+
+---
 
-## The `schema_plus` gem
 
-The `schema_plus` gem is a wrapper that pulls in a common collection of those gems.   But you can feel free to mix and match to get just the gems you want.
+The `schema_plus` gem is a wrapper that pulls in a common collection of gems from the SchemaPlus family.   But you can feel free to mix and match to get just the gems you want.
 
 Note: Prior to version 2.0, `schema_plus` was a single monolothic gem that implemented in itself all the features that are now included by the wrapper.
 
@@ -112,7 +118,7 @@ or in a Gemfile
 # Prerelease:  Documentation of features still be moved into separate feature gems
 
 
-> **NOTE** The documentation in this README is leftover from the 1.x branch; the functionality is the same, but some of the core features of schema_plus (such as foreign keys & inline index definition) are now provided by ActiveRecord 4.2.  schema_plus still provides extra functionality beyond AR 4.2, but the documentation needs to be updated to be clear what's an enhancement of AR 4.2 capabilities rather than completely new features.
+> **NOTE** The documentation in this README is leftover from the 1.x branch; the functionality is the same, but some of the core features of schema_plus (such as foreign keys) are now provided by ActiveRecord 4.2.  schema_plus still provides extra functionality beyond AR 4.2, but the documentation needs to be updated to be clear what's an enhancement of AR 4.2 capabilities rather than completely new features.
 
 ### Foreign Key Constraints
 
@@ -208,25 +214,7 @@ If you are using Postgresql with a `json` column, the default value may be an un
 
 	t.json :fields, default: { field1: 'a', field2: 'b' }
 	t.json :fields, default: { value: { field1: 'a', field2: 'b' } }
-	
-
-### Column Defaults: Using
-
-SchemaPlus introduces a constant `ActiveRecord::DB_DEFAULT` that you can use
-to explicitly instruct the database to use the column default value (or
-expression).  For example:
-
-    Post.create(category: ActiveRecord::DB_DEFAULT)
-    post.update_attributes(category: ActiveRecord::DB_DEFAULT)
-
-(Without `ActiveRecord::DB_DEFAULT`, you can update a value to `NULL` but not
-to its default value.)
-
-Note that after updating, you would need to reload a record to replace
-`ActiveRecord::DB_DEFAULT` with the value assigned by the database.
 
-Note also that Sqlite3 does not support `ActiveRecord::DB_DEFAULT`; attempting
-to use it will raise `ActiveRecord::StatementInvalid`
 
 ### Schema Dump and Load (schema.rb)
 

data/lib/schema_plus/version.rb

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

data/schema_plus.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "schema_monkey", "~> 2.1"
   gem.add_dependency "schema_plus_columns", "~> 0.1"
   gem.add_dependency "schema_plus_enums", "~> 0.1"
+  gem.add_dependency "schema_plus_db_default", "~> 0.1"
   gem.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
   gem.add_dependency "schema_plus_pg_indexes", "~> 0.1", ">= 0.1.3"
   gem.add_dependency "schema_plus_tables", "~> 0.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre10
+  version: 2.0.0.pre11
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -95,6 +95,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: schema_plus_db_default
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
@@ -276,10 +290,6 @@ files:
 - 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
-- lib/schema_plus/db_default/db_default.rb
-- lib/schema_plus/db_default/middleware.rb
 - lib/schema_plus/default_expr.rb
 - lib/schema_plus/default_expr/active_record/connection_adapters/column.rb
 - lib/schema_plus/default_expr/active_record/connection_adapters/mysql2_adapter.rb
@@ -307,7 +317,6 @@ files:
 - schema_plus.gemspec
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
-- spec/schema_plus_db_default/column_spec.rb
 - spec/schema_plus_default_expr/column_default_spec.rb
 - spec/schema_plus_default_expr/migration_spec.rb
 - spec/schema_plus_default_expr/schema_dumper_spec.rb
@@ -350,7 +359,6 @@ summary: Enhances ActiveRecord schema mechanism, including more DRY index creati
 test_files:
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
-- spec/schema_plus_db_default/column_spec.rb
 - spec/schema_plus_default_expr/column_default_spec.rb
 - spec/schema_plus_default_expr/migration_spec.rb
 - spec/schema_plus_default_expr/schema_dumper_spec.rb

data/lib/schema_plus/db_default.rb

@@ -1,7 +0,0 @@
-require 'schema_plus/core'
-
-require_relative 'db_default/active_record/attribute'
-require_relative 'db_default/db_default'
-require_relative 'db_default/middleware'
-
-SchemaMonkey.register SchemaPlus::DbDefault

data/lib/schema_plus/db_default/active_record/attribute.rb

@@ -1,16 +0,0 @@
-module SchemaPlus::DbDefault
-  module ActiveRecord
-    module Attribute
-
-      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
-        super
-      end
-
-    end
-  end
-end
-

data/lib/schema_plus/db_default/db_default.rb

@@ -1,19 +0,0 @@
-require 'singleton'
-
-module SchemaPlus::DbDefault
-  class DbDefault
-    include Singleton
-    def to_s
-      'DEFAULT'
-    end
-    def id
-      self
-    end
-    def quoted_id
-      self
-    end
-  end
-  DB_DEFAULT = DbDefault.instance
-end
-
-::ActiveRecord.const_set :DB_DEFAULT, SchemaPlus::DbDefault::DB_DEFAULT

data/lib/schema_plus/db_default/middleware.rb

@@ -1,30 +0,0 @@
-module SchemaPlus::DbDefault
-  module Middleware
-
-    module Query
-      module Exec
-
-        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/spec/schema_plus_db_default/column_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe SchemaPlus::DbDefault do
-
-  let(:migration) { ::ActiveRecord::Migration }
-
-  before(:each) do
-    class User < ::ActiveRecord::Base ; end
-    create_table(User, :alpha => { :default => "gabba" }, :beta => {})
-  end
-
-  context "uses db default value", :sqlite3 => :skip do
-
-    it "when creating a record with DB_DEFAULT" do
-      User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello")
-      expect(User.last.alpha).to eq("gabba")
-      expect(User.last.beta).to eq("hello")
-    end
-
-    it "when updating a record with DB_DEFAULT" do
-      u = User.create!(:alpha => "hey", :beta => "hello")
-      u.reload
-      expect(u.alpha).to eq("hey")
-      expect(u.beta).to eq("hello")
-      u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye")
-      u.reload
-      expect(u.alpha).to eq("gabba")
-      expect(u.beta).to eq("goodbye")
-    end
-
-  end
-
-  context "raises an error", :sqlite3 => :only do
-
-    it "when creating a record with DB_DEFAULT" do
-      expect { User.create!(:alpha => ActiveRecord::DB_DEFAULT, :beta => "hello") }.to raise_error ActiveRecord::StatementInvalid
-    end
-
-    it "when updating a record with DB_DEFAULT" do
-      u = User.create!(:alpha => "hey", :beta => "hello")
-      expect { u.update_attributes(:alpha => ActiveRecord::DB_DEFAULT, :beta => "goodbye") }.to raise_error ActiveRecord::StatementInvalid
-    end
-  end
-
-  protected
-
-  def create_table(model, columns_with_options)
-    migration.suppress_messages do
-      migration.create_table model.table_name, :force => :cascade do |t|
-        columns_with_options.each_pair do |column, options|
-          t.send :string, column, options
-        end
-      end
-      model.reset_column_information
-    end
-  end
-end
-