schema_plus 0.4.1 → 1.0.0

data/spec/multiple_schemas_spec.rb

@@ -0,0 +1,127 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "with multiple schemas" do
+  let (:connection) { ActiveRecord::Base.connection }
+
+  before(:all) do
+    newdb = case connection.adapter_name
+            when /^mysql/i then      "CREATE SCHEMA IF NOT EXISTS schema_plus_test2"
+            when /^postgresql/i then "CREATE SCHEMA schema_plus_test2"
+            when /^sqlite/i then     "ATTACH ':memory:' AS schema_plus_test2"
+            end
+    begin
+      ActiveRecord::Base.connection.execute newdb
+    rescue ActiveRecord::StatementInvalid => e
+      raise unless e.message =~ /already exists/
+    end
+
+    class User < ::ActiveRecord::Base ; end
+  end
+
+  before(:each) do
+    define_schema(:auto_create => false) do
+      create_table :users, :force => true do |t|
+        t.string :login
+      end
+    end
+
+    connection.execute 'DROP TABLE IF EXISTS schema_plus_test2.users'
+    connection.execute 'CREATE TABLE schema_plus_test2.users (id ' + case connection.adapter_name
+          when /^mysql/i then      "integer primary key auto_increment"
+          when /^postgresql/i then "serial primary key"
+          when /^sqlite/i then     "integer primary key autoincrement"
+          end + ", login varchar(255))"
+  end
+
+  context "with indexes in each schema" do
+    before(:each) do
+      connection.execute 'CREATE INDEX ' + case connection.adapter_name
+      when /^mysql/i then      "index_users_on_login ON schema_plus_test2.users"
+      when /^postgresql/i then "index_users_on_login ON schema_plus_test2.users"
+      when /^sqlite/i then     "schema_plus_test2.index_users_on_login ON users"
+      end + " (login)"
+    end
+
+    it "should not find indexes in other schema" do
+      User.reset_column_information
+      User.indexes.should be_empty
+    end
+
+    it "should find index in current schema" do
+      connection.execute 'CREATE INDEX index_users_on_login ON users (login)'
+      User.reset_column_information
+      User.indexes.map(&:name).should == ['index_users_on_login']
+    end
+  end
+
+  context "with views in each schema" do
+    around(:each) do  |example|
+      begin
+        example.run
+      ensure
+        connection.execute 'DROP VIEW schema_plus_test2.myview' rescue nil
+        connection.execute 'DROP VIEW myview' rescue nil
+      end
+    end
+
+    before(:each) do
+      connection.views.each { |view| connection.drop_view view }
+      connection.execute 'CREATE VIEW schema_plus_test2.myview AS SELECT * FROM users'
+    end
+
+    it "should not find views in other schema" do
+      connection.views.should be_empty
+    end
+
+    it "should find views in this schema" do
+      connection.execute 'CREATE VIEW myview AS SELECT * FROM users'
+      connection.views.should == ['myview']
+    end
+  end
+
+  context "with foreign key in each schema" do
+    before(:each) do
+      class Comment < ::ActiveRecord::Base ; end
+      connection.execute 'DROP TABLE IF EXISTS schema_plus_test2.comments'
+      connection.execute 'CREATE TABLE schema_plus_test2.comments (user_id integer,' + case connection.adapter_name
+            when /^mysql/i then      "foreign key (user_id) references schema_plus_test2.users (id))"
+            when /^postgresql/i then "foreign key (user_id) references schema_plus_test2.users (id))"
+            when /^sqlite/i then     "foreign key (user_id) references users (id))"
+            end
+    end
+
+    around(:each) do |example|
+      begin
+        example.run
+      ensure
+        connection.execute 'DROP TABLE IF EXISTS comments'
+        connection.execute 'DROP TABLE IF EXISTS schema_plus_test2.comments'
+      end
+    end
+
+    it "should not find foreign keys in other schema" do
+      connection.create_table :comments, :force => true do |t|
+        t.integer :user_id, :foreign_key => false
+      end
+      Comment.reset_column_information
+      Comment.foreign_keys.length.should == 0
+      User.reset_column_information
+      User.reverse_foreign_keys.length.should == 0
+    end
+
+    it "should find foreign keys in this schema" do
+      connection.create_table :comments, :force => true do |t|
+        t.integer :user_id, :foreign_key => true
+      end
+      Comment.reset_column_information
+      Comment.foreign_keys.map(&:column_names).flatten.should == ["user_id"]
+      User.reset_column_information
+      User.reverse_foreign_keys.map(&:column_names).flatten.should == ["user_id"]
+    end
+
+  end
+
+end
+
+
+

data/spec/schema_dumper_spec.rb

@@ -36,37 +36,44 @@ describe "Schema dump" do
     class ::Comment < ActiveRecord::Base ; end
   end
 
-  let(:dump_posts) do
-    stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = %w[users comments]
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-    stream.string
+  it "should include foreign_key definition" do
+    with_foreign_key Post, :user_id, :users, :id do
+      dump_posts.should match(to_regexp(%q{t.foreign_key ["user_id"], "users", ["id"]}))
+    end
   end
 
-  let(:dump_all) do
-    stream = StringIO.new
-    ActiveRecord::SchemaDumper.ignore_tables = []
-    ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
-    stream.string
+  it "should include foreign_key name" do
+    with_foreign_key Post, :user_id, :users, :id, :name => "yippee" do
+      dump_posts.should match /foreign_key.*user_id.*users.*id.*:name => "yippee"/
+    end
   end
 
-  it "should include foreign_key definition" do
-    with_foreign_key Post, :user_id, :users, :id do
-      dump_posts.should match(to_regexp(%q{t.foreign_key ["user_id"], "users", ["id"]}))
+  it "should sort foreign_key definitions" do
+    with_foreign_keys Comment, [ [ :post_id, :posts, :id ], [ :commenter_id, :users, :id ]] do
+      dump_schema.should match(/foreign_key.+commenter_id.+foreign_key.+post_id/m)
     end
   end
 
   context "with constraint dependencies" do
     it "should sort in Posts => Comments direction" do
       with_foreign_key Comment, :post_id, :posts, :id do
-        dump_all.should match(%r{create_table "posts".*create_table "comments"}m)
+        dump_schema.should match(%r{create_table "posts".*create_table "comments"}m)
       end
     end
     it "should sort in Comments => Posts direction" do
       with_foreign_key Post, :first_comment_id, :comments, :id do
-        dump_all.should match(%r{create_table "comments".*create_table "posts"}m)
+        dump_schema.should match(%r{create_table "comments".*create_table "posts"}m)
       end
     end
+
+    it "should handle regexp in ignore_tables" do
+      with_foreign_key Comment, :post_id, :posts, :id do
+        dump = dump_schema(:ignore => /post/)
+        dump.should match /create_table "comments"/
+        dump.should_not match /create_table "posts"/
+      end
+    end
+
   end
 
   context "with date default" do
@@ -82,6 +89,12 @@ describe "Schema dump" do
           dump_posts.should match(%r{t.datetime "posted_at",\s*:default => '2001-09-28 00:00:00'})
         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
+          dump_posts.should match(%r{t.string\s+"name", :default => { :expr => "\\"substring\\"\(\(random\(\)\)::text, 3, 6\)" }})
+        end
+      end
     end
 
     if SchemaPlusHelpers.sqlite3?
@@ -126,8 +139,8 @@ describe "Schema dump" do
   end
 
   it "should include index name" do
-    with_index Post, :user_id, :name => "posts_user_id_index" do
-      dump_posts.should match(to_regexp(%q{t.index ["user_id"], :name => "posts_user_id_index"}))
+    with_index Post, :user_id, :name => "custom_name" do
+      dump_posts.should match(to_regexp(%q{t.index ["user_id"], :name => "custom_name"}))
     end
   end
   
@@ -137,6 +150,16 @@ describe "Schema dump" do
     end
   end
 
+  unless SchemaPlusHelpers.mysql?
+
+    it "should include index order" do
+      with_index Post, [:user_id, :first_comment_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
+        dump_posts.should match(%r{t.index \["user_id", "first_comment_id"\],.*:order => {"user_id" => :asc, "first_comment_id" => :desc}})
+      end
+    end
+
+  end
+
   if SchemaPlusHelpers.postgresql?
 
     it "should define case insensitive index" do
@@ -176,15 +199,15 @@ describe "Schema dump" do
       end
 
       it "should not raise an error" do
-        expect { dump_all }.should_not raise_error
+        expect { dump_schema }.to_not raise_error
       end
 
       it "should dump constraints after the tables they reference" do
-        dump_all.should match(%r{create_table "comments".*foreign_key.*\["first_comment_id"\], "comments", \["id"\]}m)
-        dump_all.should match(%r{create_table "posts".*foreign_key.*\["first_post_id"\], "posts", \["id"\]}m)
-        dump_all.should match(%r{create_table "posts".*foreign_key.*\["post_id"\], "posts", \["id"\]}m)
-        dump_all.should match(%r{create_table "users".*foreign_key.*\["commenter_id"\], "users", \["id"\]}m)
-        dump_all.should match(%r{create_table "users".*foreign_key.*\["user_id"\], "users", \["id"\]}m)
+        dump_schema.should match(%r{create_table "comments".*foreign_key.*\["first_comment_id"\], "comments", \["id"\]}m)
+        dump_schema.should match(%r{create_table "posts".*foreign_key.*\["first_post_id"\], "posts", \["id"\]}m)
+        dump_schema.should match(%r{create_table "posts".*foreign_key.*\["post_id"\], "posts", \["id"\]}m)
+        dump_schema.should match(%r{create_table "users".*foreign_key.*\["commenter_id"\], "users", \["id"\]}m)
+        dump_schema.should match(%r{create_table "users".*foreign_key.*\["user_id"\], "users", \["id"\]}m)
       end
     end
   end
@@ -207,14 +230,20 @@ describe "Schema dump" do
     yield
   end
 
-  def with_foreign_key(model, columns, referenced_table_name, referenced_columns, options = {})
+  def with_foreign_key(model, columns, referenced_table_name, referenced_columns, options = {}, &block)
+    with_foreign_keys(model, [[columns, referenced_table_name, referenced_columns, options]], &block)
+  end
+
+  def with_foreign_keys(model, columnsets)
     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
         end
-        t.foreign_key columns, referenced_table_name, referenced_columns, options
+        columnsets.each do |columns, referenced_table_name, referenced_columns, options|
+          t.foreign_key columns, referenced_table_name, referenced_columns, options || {}
+        end
       end
     end
     model.reset_column_information
@@ -257,4 +286,15 @@ describe "Schema dump" do
     name ||= model.foreign_keys.detect { |fk| fk.table_name == model.table_name.to_s && fk.column_names == Array(columns).collect(&:to_s) }.name
   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

data/spec/schema_spec.rb

@@ -17,42 +17,40 @@ describe ActiveRecord::Schema do
     end
 
     it "should pass" do
-      expect { define_schema }.should_not raise_error
+      expect { do_schema }.to_not raise_error
     end
 
     it "should create only explicity added indexes" do
-      define_schema
+      do_schema
       expected = SchemaPlusHelpers.mysql? ? 2 : 1
       connection.tables.collect { |table| connection.indexes(table) }.flatten.should have(expected).items
     end
 
     it "should create only explicity added foriegn keys" do
-      define_schema
+      do_schema
       connection.tables.collect { |table| connection.foreign_keys(table) }.flatten.should have(2).items
     end
 
   end
 
   protected
-  def define_schema
-    ActiveRecord::Migration.suppress_messages do
-      schema.define do
-        connection.tables.each do |table| drop_table table end
+  def do_schema
+    define_schema do
+      connection.tables.each do |table| drop_table table end
 
-        create_table :users, :force => true do
-        end
+      create_table :users, :force => true do
+      end
 
-        create_table :colors, :force => true do
-        end
+      create_table :colors, :force => true do
+      end
 
-        create_table :shoes, :force => true do
-        end
+      create_table :shoes, :force => true do
+      end
 
-        create_table :posts, :force => true do |t|
-          t.integer :user_id, :references => :users, :index => true
-          t.integer :shoe_id, :references => :shoes   # should not have an index (except mysql)
-          t.integer :color_id   # should not have a foreign key nor index
-        end
+      create_table :posts, :force => true do |t|
+        t.integer :user_id, :references => :users, :index => true
+        t.integer :shoe_id, :references => :shoes   # should not have an index (except mysql)
+        t.integer :color_id   # should not have a foreign key nor index
       end
     end
   end

data/spec/spec_helper.rb

@@ -19,30 +19,31 @@ RSpec.configure do |config|
   config.include(SchemaPlusHelpers)
 end
 
-def load_schema(name)
-  ActiveRecord::Migration.suppress_messages do
-    eval(File.read(File.join(File.dirname(__FILE__), 'schema', name)))
+def with_fk_config(opts, &block)
+  save = Hash[opts.keys.collect{|key| [key, SchemaPlus.config.foreign_keys.send(key)]}]
+  begin
+    SchemaPlus.config.foreign_keys.update_attributes(opts)
+    yield
+  ensure
+    SchemaPlus.config.foreign_keys.update_attributes(save)
   end
 end
 
-def load_core_schema
-  SchemaPlus.setup do |config|
-    config.foreign_keys.auto_create = false;
-  end
-  load_schema('core_schema.rb')
-  load 'models/user.rb'
-  load 'models/post.rb'
-  load 'models/comment.rb'
+def with_fk_auto_create(value = true, &block)
+  with_fk_config(:auto_create => value, &block)
 end
 
-def load_auto_schema
-  SchemaPlus.setup do |config|
-    config.foreign_keys.auto_create = true;
+def define_schema(config={}, &block)
+  with_fk_config(config) do
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Schema.define do
+        connection.tables.each do |table|
+          drop_table table
+        end
+        instance_eval &block
+      end
+    end
   end
-  load_schema('auto_schema.rb')
-  load 'models/user.rb'
-  load 'models/post.rb'
-  load 'models/comment.rb'
 end
 
 def remove_all_models

data/spec/support/matchers/reference.rb

@@ -23,7 +23,8 @@ module SchemaPlusMatchers
         @result.any? do |fk| 
           fk.column_names == @column_names &&
             (@on_update ? fk.on_update == @on_update : true) &&
-            (@on_delete ? fk.on_delete == @on_delete : true)
+            (@on_delete ? fk.on_delete == @on_delete : true) &&
+            (@name ? fk.name == @name : true)
         end
       else
         !@result.empty?
@@ -56,6 +57,11 @@ module SchemaPlusMatchers
       self
     end
 
+    def with_name(action)
+      @name = action
+      self
+    end
+
   end
 
   def reference(*expect)

data/spec/views_spec.rb

@@ -1,5 +1,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+class Item < ActiveRecord::Base
+end
+
 class AOnes < ActiveRecord::Base
 end
 
@@ -81,7 +84,7 @@ describe ActiveRecord do
 
 
       it "should raise an error by default" do
-        expect {migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)')}.should raise_error ActiveRecord::StatementInvalid
+        expect {migration.create_view('dupe_me', 'SELECT * FROM items WHERE (a=2)')}.to raise_error ActiveRecord::StatementInvalid
       end
 
       it "should override existing definition if :force true" do
@@ -137,7 +140,7 @@ describe ActiveRecord do
           t.string  :s
         end
 
-        create_view :a_ones, "select b, s from items where a = 1"
+        create_view :a_ones, Item.select('b, s').where(:a => 1)
         create_view :ab_ones, "select s from a_ones where b = 1"
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70097168546520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70097168546520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: valuable
-  requirement: &70097168546100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,21 +38,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097168546100
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70097168545600 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: *70097168545600
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70097168071980 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,21 +54,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097168071980
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: &70097168069640 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70097168069640
 - !ruby/object:Gem::Dependency
-  name: mysql
-  requirement: &70097168068180 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,21 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097168068180
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &70097168067300 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70097168067300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70097168066460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097168066460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov-gem-adapter
-  requirement: &70097168065260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,7 +102,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097168065260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'SchemaPlus is an ActiveRecord extension that provides enhanced capabilities
   for schema definition and querying, including: enhanced and more DRY index capabilities,
   support and automation for foreign key constraints, and support for views.'
@@ -127,14 +124,11 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- gemfiles/Gemfile.rails-2.3
-- gemfiles/Gemfile.rails-2.3.lock
-- gemfiles/Gemfile.rails-3.0
-- gemfiles/Gemfile.rails-3.0.lock
-- gemfiles/Gemfile.rails-3.1
-- gemfiles/Gemfile.rails-3.1.lock
-- gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-3.2.lock
+- gemfiles/rails-3.2/Gemfile.base
+- gemfiles/rails-3.2/Gemfile.mysql
+- gemfiles/rails-3.2/Gemfile.mysql2
+- gemfiles/rails-3.2/Gemfile.postgresql
+- gemfiles/rails-3.2/Gemfile.sqlite3
 - init.rb
 - lib/rails/tasks/database.rake
 - lib/schema_plus.rb
@@ -149,6 +143,7 @@ files:
 - lib/schema_plus/active_record/connection_adapters/schema_statements.rb
 - lib/schema_plus/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/active_record/connection_adapters/table_definition.rb
+- lib/schema_plus/active_record/db_default.rb
 - lib/schema_plus/active_record/foreign_keys.rb
 - lib/schema_plus/active_record/schema.rb
 - lib/schema_plus/active_record/schema_dumper.rb
@@ -168,10 +163,7 @@ files:
 - spec/index_definition_spec.rb
 - spec/index_spec.rb
 - spec/migration_spec.rb
-- spec/models/comment.rb
-- spec/models/post.rb
-- spec/models/user.rb
-- spec/rails3_migration_spec.rb
+- spec/multiple_schemas_spec.rb
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
 - spec/schema_dumper_spec.rb
@@ -203,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: schema_plus
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
@@ -221,10 +213,7 @@ test_files:
 - spec/index_definition_spec.rb
 - spec/index_spec.rb
 - spec/migration_spec.rb
-- spec/models/comment.rb
-- spec/models/post.rb
-- spec/models/user.rb
-- spec/rails3_migration_spec.rb
+- spec/multiple_schemas_spec.rb
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
 - spec/schema_dumper_spec.rb