schema_plus 2.0.0.pre11 → 2.0.0.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18fb53e5cdb54375f9ebd2f978833266b7b61f38
-  data.tar.gz: c2b17dd83a109cdb32f10c7883447f14b85f9ffd
+  metadata.gz: 6212de06ef0629d376189de1d623b4ad52969b56
+  data.tar.gz: e7440ee39d1624b786e39da1245312f7ca61497f
 SHA512:
-  metadata.gz: 95c9f95715df96aca11804ab355833bfd61d624e5bf8d493ed00d3dc265dd06b089921b0aaeb745e6c209bc8594e72b3b7599dfa668d90a2a5e1670139aea22e
-  data.tar.gz: 7519c544165bf8324754dee3e5249b99bf9943d7734e8dc976f06813f8bf89a1f32ed90f5861567d09d72c4f2f4f035469f564d28a03772760c91fec3289be6e
+  metadata.gz: 58105ec47fdea7b6460c2a5f1dad67f5e0fa16f0fc615d6a9e42def7cc83600b2ce334c76f043cb667d13f9defa27cdfdff94bf277399b99611ad30a5f98c45e
+  data.tar.gz: 88d0d8a42cfc9a95697816490acb3471e8ebdaa7f14dd956e18306ee67df90f4ec3d387696e488d669d2e1fa84415c8dd6bedcb9cf8725f26d50d6b32021fbed

data/README.md

@@ -13,7 +13,7 @@ Gem | Description | Included In `schema_plus` gem?
 <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
 [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_default_expr](https://github.com/SchemaPlus/schema_plus_default_expr)  | 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
 [schema_plus_indexes](https://github.com/SchemaPlus/schema_plus_indexes) | Convenience and consistency in using indexes | Y
@@ -186,36 +186,6 @@ has some information that may be of assistance in resolving these issues.
 
 SchemaPlus extends `create_table ... force: true` to use `:cascade`
 
-### Column Defaults: Expressions
-
-SchemaPlus allows defaults to be set using expressions or constant values:
-
-    t.datetime :seen_at, default: { expr: 'NOW()' }
-    t.datetime :seen_at, default: { value: "2011-12-11 00:00:00" }
-
-Note that in MySQL only the TIMESTAMP column data type accepts SQL column
-defaults and Rails uses DATETIME, so expressions can't be used with MySQL.
-
-The standard syntax will still work as usual:
-
-    t.datetime :seen_at, default: "2011-12-11 00:00:00"
-
-Also, as a convenience
-
-    t.datetime :seen_at, default: :now
-
-resolves to:
-
-    NOW()                 # PostgreSQL
-    (DATETIME('now'))     # SQLite3
-    invalid               # MySQL
-
-If you are using Postgresql with a `json` column, the default value may be an unadorned hash.  A hash having just one key `:expr` or `:value` will be taken as schema_plus syntax; i.e, these two are equivalent:
-
-	t.json :fields, default: { field1: 'a', field2: 'b' }
-	t.json :fields, default: { value: { field1: 'a', field2: 'b' } }
-
-
 ### Schema Dump and Load (schema.rb)
 
 When dumping `schema.rb`, SchemaPlus orders the views and tables in the schema

data/lib/schema_plus/version.rb

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

data/schema_plus.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |gem|
   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_default_expr", "~> 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.pre11
+  version: 2.0.0.pre12
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -109,6 +109,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: schema_plus_default_expr
+  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
@@ -290,12 +304,6 @@ files:
 - gemfiles/activerecord-4.2.1/Gemfile.postgresql
 - gemfiles/activerecord-4.2.1/Gemfile.sqlite3
 - lib/schema_plus.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
-- lib/schema_plus/default_expr/active_record/connection_adapters/postgresql_adapter.rb
-- lib/schema_plus/default_expr/active_record/connection_adapters/sqlite3_adapter.rb
-- lib/schema_plus/default_expr/middleware.rb
 - lib/schema_plus/foreign_keys.rb
 - lib/schema_plus/foreign_keys/active_record/base.rb
 - lib/schema_plus/foreign_keys/active_record/connection_adapters/abstract_adapter.rb
@@ -317,9 +325,6 @@ files:
 - schema_plus.gemspec
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.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
 - spec/schema_plus_foreign_keys/foreign_key_definition_spec.rb
 - spec/schema_plus_foreign_keys/foreign_key_spec.rb
 - spec/schema_plus_foreign_keys/migration_spec.rb
@@ -359,9 +364,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_default_expr/column_default_spec.rb
-- spec/schema_plus_default_expr/migration_spec.rb
-- spec/schema_plus_default_expr/schema_dumper_spec.rb
 - spec/schema_plus_foreign_keys/foreign_key_definition_spec.rb
 - spec/schema_plus_foreign_keys/foreign_key_spec.rb
 - spec/schema_plus_foreign_keys/migration_spec.rb

data/lib/schema_plus/default_expr.rb

@@ -1,33 +0,0 @@
-require 'schema_plus/core'
-
-require_relative 'default_expr/middleware'
-require_relative 'default_expr/active_record/connection_adapters/column'
-
-module SchemaPlus::DefaultExpr
-  module ActiveRecord
-    module ConnectionAdapters
-      #
-      # Each adapter needs to define these two functions:
-      #
-      # default_expr_valid?(expr)
-      #
-      # Return true if the passed expression can be used as a column
-      # default value.  (For most databases the specific expression
-      # doesn't matter, and the adapter's function would return a
-      # constant true if default expressions are supported or false if
-      # they're not.)
-      #
-      # sql_for_function(function_name)
-      #
-      # Return SQL definition for a given canonical function_name symbol.
-      # Currently, the only function to support is :now, which should
-      # return a DATETIME object for the current time.
-      #
-      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 SchemaPlus::DefaultExpr

data/lib/schema_plus/default_expr/active_record/connection_adapters/column.rb

@@ -1,14 +0,0 @@
-module SchemaPlus::DefaultExpr
-  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/mysql2_adapter.rb

@@ -1,17 +0,0 @@
-module SchemaPlus::DefaultExpr
-  module ActiveRecord
-    module ConnectionAdapters
-      module Mysql2Adapter
-        def default_expr_valid?(expr)
-          false # only the TIMESTAMP column accepts SQL column defaults and rails uses DATETIME
-        end
-
-        def sql_for_function(function)
-          case function
-          when :now then 'CURRENT_TIMESTAMP'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/schema_plus/default_expr/active_record/connection_adapters/postgresql_adapter.rb

@@ -1,18 +0,0 @@
-module SchemaPlus::DefaultExpr
-  module ActiveRecord
-    module ConnectionAdapters
-      module PostgresqlAdapter
-        def default_expr_valid?(expr)
-          true # arbitrary sql is okay in PostgreSQL
-        end
-
-        def sql_for_function(function)
-          case function
-          when :now
-            "NOW()"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/schema_plus/default_expr/active_record/connection_adapters/sqlite3_adapter.rb

@@ -1,19 +0,0 @@
-module SchemaPlus::DefaultExpr
-  module ActiveRecord
-    module ConnectionAdapters
-      module Sqlite3Adapter
-
-        def default_expr_valid?(expr)
-          true # arbitrary sql is okay
-        end
-
-        def sql_for_function(function)
-          case function
-          when :now
-            "(DATETIME('now'))"
-          end
-        end
-      end
-    end
-  end
-end

data/lib/schema_plus/default_expr/middleware.rb

@@ -1,55 +0,0 @@
-module SchemaPlus::DefaultExpr
-  module Middleware
-
-    module Sql
-      module ColumnOptions
-
-        # Add options for default expressions
-        def before(env)
-          options = env.options
-
-          return unless (default = options[:default])
-
-          if default.is_a? Hash and [[:expr], [:value]].include?(default.keys)
-            value = default[:value]
-            expr = env.connection.sql_for_function(default[:expr]) || default[:expr] if default[:expr]
-          else
-            value = default
-            expr = env.connection.sql_for_function(default)
-          end
-
-          if expr
-            raise ArgumentError, "Invalid default expression" unless env.connection.default_expr_valid?(expr)
-            env.sql << " DEFAULT #{expr}"
-            # must explicitly check for :null to allow change_column to work on migrations
-            if options[:null] == false
-              env.sql << " NOT NULL"
-            end
-            options.delete(:default)
-            options.delete(:null)
-          else
-            options[:default] = value
-          end
-        end
-      end
-    end
-
-    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
-      end
-    end
-  end
-end

data/spec/schema_plus_default_expr/column_default_spec.rb

@@ -1,149 +0,0 @@
-require 'spec_helper'
-
-describe "Column definition" do
-  before(:each) do
-    define_schema(:auto_create => true) do
-      create_table :models, :force => true do |t|
-      end
-    end
-    class Model < ::ActiveRecord::Base ; end
-  end
-
-  subject {
-    Model.connection.execute("INSERT INTO models (dummy) values (1)")
-    Model.last.reload.test_column
-  }
-
-  context "text columns" do
-
-    before(:each) do
-      @nowish = /(#{Time.now.utc.to_s.sub(/:[^:]+$/, '')}|#{Time.now.to_s.sub(/:[^:]+$/,'')}).*/
-    end
-
-    context "just default passed" do
-      before(:each) do
-        define_test_column(:string, :default => "2011-12-11 00:00:00")
-      end
-
-      it "should use the normal default" do
-        is_expected.to eq "2011-12-11 00:00:00"
-      end
-    end
-
-    context "just default passed in hash" do
-      before(:each) do
-        define_test_column(:string, :default => { :value => "2011-12-11 00:00:00" })
-      end
-
-      it "should use the normal default" do
-        is_expected.to eq "2011-12-11 00:00:00"
-      end
-    end
-
-    context "default passed with no nulls" do
-      before(:each) do
-        define_test_column(:string, :default => "2011-12-11 00:00:00", null: false)
-      end
-
-      it "should use the normal default" do
-        is_expected.to eq "2011-12-11 00:00:00"
-      end
-    end
-
-    context "default passed in hash with no nulls" do
-      before(:each) do
-        define_test_column(:string, :default => { :value => "2011-12-11 00:00:00" }, null: false)
-      end
-
-      it "should use the normal default" do
-        is_expected.to eq "2011-12-11 00:00:00"
-      end
-    end
-
-    context "default function passed as :now" do
-      before(:each) do
-        begin
-          define_test_column(:string, :default => :now)
-        rescue ArgumentError => e
-          @raised_argument_error = e
-        end
-      end
-
-      it "should use NOW() as the default", :mysql => :skip do
-        is_expected.to match @nowish
-      end
-
-      it "should raise an error", :mysql => :only do
-        expect(@raised_argument_error).to be_a ArgumentError
-      end
-    end
-
-    context "default function passed as now with no nulls" do
-      before(:each) do
-        begin
-          define_test_column(:string, :default => :now, null: false)
-        rescue ArgumentError => e
-          @raised_argument_error = e
-        end
-      end
-
-      it "should use NOW() as the default", :mysql => :skip do
-        is_expected.to match @nowish
-      end
-
-      it "should raise an error", :mysql => :only do
-        expect(@raised_argument_error).to be_a ArgumentError
-      end
-    end
-
-    context "valid expr passed as default" do
-      it "uses the expression", :mysql => :skip do
-        define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
-        is_expected.to eq "THIS IS A DOG"
-      end
-
-      it "raises an error", :mysql => :only do
-        expect {
-          define_test_column(:string, :default => { :expr => "(replace('THIS IS A TEST', 'TEST', 'DOG'))" })
-        }.to raise_error ArgumentError
-      end
-    end
-
-  end
-
-  context "boolean column" do
-
-    context "passed as boolean false" do
-      before(:each) do
-        define_test_column :boolean, :default => false
-      end
-
-      it "should give the default as false" do
-        is_expected.to eq false
-      end
-    end
-
-    context "passed as boolean true" do
-      before(:each) do
-        define_test_column :boolean, :default => true
-      end
-
-      it "should give the default as true" do
-        is_expected.to eq true
-      end
-    end
-  end
-
-  private
-
-  def define_test_column(type, *args)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table Model.table_name, :force => true do |t|
-        t.send type, :test_column, *args
-        t.integer :dummy
-      end
-    end
-    Model.reset_column_information
-    @column = Model.columns.first()
-  end
-end

data/spec/schema_plus_default_expr/migration_spec.rb

@@ -1,44 +0,0 @@
-require 'spec_helper'
-
-describe ActiveRecord::Migration do
-
-  before(:each) do
-    define_schema(:auto_create => true) do
-      create_table :posts, :force => true do |t|
-        t.string :content
-      end
-    end
-    class Post < ::ActiveRecord::Base ; end
-  end
-
-  context "when table is created" do
-
-    before(:each) do
-      @model = Post
-    end
-
-    it "should properly handle default values for booleans" do
-      expect {
-        recreate_table(@model) do |t|
-          t.boolean :bool, :default => true
-        end
-      }.to_not raise_error
-      expect(@model.create.reload.bool).to be true
-    end
-
-    it "should properly handle default values for json (#195)", :postgresql => :only do
-      recreate_table(@model) do |t|
-        t.json :json, :default => {}
-      end
-      expect(@model.create.reload.json).to eq({})
-    end
-
-  end
-
-  def recreate_table(model, opts={}, &block)
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, opts.merge(:force => true), &block
-    end
-    model.reset_column_information
-  end
-end

data/spec/schema_plus_default_expr/schema_dumper_spec.rb

@@ -1,116 +0,0 @@
-require 'spec_helper'
-require 'stringio'
-
-describe "Schema dump" do
-
-  before(:all) do
-    SchemaPlus::ForeignKeys.setup do |config|
-      config.auto_create = false
-    end
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, force: :cascade end
-
-        create_table :posts, :force => true do |t|
-          t.text :body
-          t.integer :user_id
-          t.integer :first_comment_id
-          t.string :string_no_default
-          t.integer :short_id
-          t.string :str_short
-          t.integer :integer_col
-          t.float :float_col
-          t.decimal :decimal_col
-          t.datetime :datetime_col
-          t.timestamp :timestamp_col
-          t.time :time_col
-          t.date :date_col
-          t.binary :binary_col
-          t.boolean :boolean_col
-        end
-
-      end
-    end
-    class ::Post < ActiveRecord::Base ; end
-  end
-
-  context "with date default", :postgresql => :only do
-    it "should dump the default hash expr as now()" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr\s*=>)\s*"now\(\)"\s*\}})
-      end
-    end
-
-    it "should dump the default hash expr as CURRENT_TIMESTAMP" do
-      with_additional_column Post, :posted_at, :datetime, :default => {:expr => 'date \'2001-09-28\''} do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>).*2001-09-28.*})
-      end
-    end
-
-    it "can dump a complex default expression" do
-      with_additional_column Post, :name, :string, :default => {:expr => 'substring(random()::text from 3 for 6)'} do
-        expect(dump_posts).to match(%r{t\.string\s+"name",\s*(?:default:|:default\s*=>)\s*{\s*(?:expr:|:expr\s*=>)\s*"\\"substring\\"\(\(random\(\)\)::text, 3, 6\)"\s*}})
-      end
-    end
-  end
-
-  context "with date default", :sqlite3 => :only do
-    it "should dump the default hash expr as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => :now do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
-      end
-    end
-
-    it "should dump the default hash expr string as now" do
-      with_additional_column Post, :posted_at, :datetime, :default => { :expr => "(DATETIME('now'))" } do
-        expect(dump_posts).to match(%r{t\.datetime\s+"posted_at",\s*(?:default:|:default =>)\s*\{\s*(?:expr:|:expr =>)\s*"\(DATETIME\('now'\)\)"\s*\}})
-      end
-    end
-
-    it "should dump the default value normally" do
-      with_additional_column Post, :posted_at, :string, :default => "now" do
-        expect(dump_posts).to match(%r{t\.string\s*"posted_at",\s*(?:default:|:default =>)\s*"now"})
-      end
-    end
-  end
-
-  it "should leave out :default when default was changed to null" do
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.change_column_default :posts, :string_no_default, nil
-    end
-    # mysql2 includes 'limit: 255' in the output.  that's OK, just want to
-    # make sure the full line doesn't have 'default' in it.
-    expect(dump_posts).to match(%r{t\.string\s+"string_no_default"\s*(,\s*limit:\s*\d+)?$})
-  end
-
-  protected
-  def to_regexp(string)
-    Regexp.new(Regexp.escape(string))
-  end
-
-  def with_additional_column(model, column_name, column_type, options)
-    table_columns = model.columns.reject{|column| column.name == 'id'}
-    ActiveRecord::Migration.suppress_messages do
-      ActiveRecord::Migration.create_table model.table_name, :force => true do |t|
-        table_columns.each do |column|
-          t.column column.name, column.type, :default => column.default
-        end
-        t.column column_name, column_type, options
-      end
-    end
-    yield
-  end
-
-  def dump_schema(opts={})
-    stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = Array.wrap(opts[:ignore]) || []
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-    stream.string
-  end
-
-  def dump_posts
-    dump_schema(:ignore => %w[users comments])
-  end
-
-end
-