schema_plus 1.8.9 → 2.0.0.pre1

data/spec/{enum_spec.rb → schema_pg_enums/enum_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 def enum_fields(name, schema = 'public')
   sql = <<-SQL

data/spec/schema_pg_enums/schema_dumper_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+require 'stringio'
+
+describe "Schema dump" do
+
+  context 'with enum', :postgresql => :only do
+    let(:connection) { ActiveRecord::Base.connection }
+
+    it 'should include enum' do
+      begin
+        connection.execute "CREATE TYPE color AS ENUM ('red', 'green', 'blue')"
+        expect(dump_schema).to match(%r{create_enum "color", "red", "green", "blue"})
+      ensure
+        connection.execute "DROP TYPE color"
+      end
+    end
+
+    it 'should include enum with schema' do
+      begin
+        connection.execute "CREATE SCHEMA cmyk; CREATE TYPE cmyk.color AS ENUM ('cyan', 'magenta', 'yellow', 'black')"
+        expect(dump_schema).to match(%r{create_enum "color", "cyan", "magenta", "yellow", "black", :schema => "cmyk"})
+      ensure
+        connection.execute "DROP SCHEMA cmyk CASCADE"
+      end
+    end
+  end
+
+  protected
+
+  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
+
+end

data/spec/schema_views/named_schemas_spec.rb

@@ -0,0 +1,97 @@
+require 'spec_helper'
+
+describe "with multiple schemas" do
+  def connection
+    ActiveRecord::Base.connection
+  end
+
+  before(:all) do
+    newdb = case connection.adapter_name
+            when /^mysql/i then      "CREATE SCHEMA IF NOT EXISTS schema_views_test2"
+            when /^postgresql/i then "CREATE SCHEMA schema_views_test2"
+            when /^sqlite/i then     "ATTACH ':memory:' AS schema_views_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_views_test2.users'
+    connection.execute 'CREATE TABLE schema_views_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 views in each schema" do
+    around(:each) do  |example|
+      begin
+        example.run
+      ensure
+        connection.execute 'DROP VIEW schema_views_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_views_test2.myview AS SELECT * FROM users'
+    end
+
+    it "should not find views in other schema" do
+      expect(connection.views).to be_empty
+    end
+
+    it "should find views in this schema" do
+      connection.execute 'CREATE VIEW myview AS SELECT * FROM users'
+      expect(connection.views).to eq(['myview'])
+    end
+  end
+
+  context "when using PostGIS", :postgresql => :only do
+    before(:all) do
+      begin
+        connection.execute "CREATE SCHEMA postgis"
+      rescue ActiveRecord::StatementInvalid => e
+        raise unless e.message =~ /already exists/
+      end
+    end
+
+    around(:each) do |example|
+      begin
+        connection.execute "SET search_path to '$user','public','postgis'"
+        example.run
+      ensure
+        connection.execute "SET search_path to '$user','public'"
+      end
+    end
+
+    before(:each) do
+      allow(connection).to receive(:adapter_name).and_return('PostGIS')
+    end
+
+    it "should hide views in postgis schema" do
+      begin
+        connection.create_view "postgis.hidden", "select 1", :force => true
+        connection.create_view :myview, "select 2", :force => true
+        expect(connection.views).to eq(["myview"])
+      ensure
+        connection.execute 'DROP VIEW postgis.hidden' rescue nil
+        connection.execute 'DROP VIEW myview' rescue nil
+      end
+    end
+  end
+
+end

data/spec/{views_spec.rb → schema_views/views_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'spec_helper'
 
 class Item < ActiveRecord::Base
 end

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ require 'schema_plus'
 require 'schema_dev/rspec'
 require 'its-it'
 
-SchemaDev::Rspec.setup_db
+SchemaDev::Rspec.setup
 
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
@@ -60,3 +60,4 @@ def remove_all_models
   end
 
 SimpleCov.command_name "[ruby #{RUBY_VERSION} - ActiveRecord #{::ActiveRecord::VERSION::STRING} - #{ActiveRecord::Base.connection.adapter_name}]"
+

data/spec/support/matchers/reference.rb

@@ -2,24 +2,23 @@ module SchemaPlusMatchers
 
   class Reference
     def initialize(expected)
-      @column_names = @on_update = @on_delete = @deferrable = @name = @references_table_name = @references_column_names = nil
+      @column = @on_update = @on_delete = @deferrable = @name = @to_table = @primary_key = nil
       unless expected.empty?
-        @references_column_names = Array(expected).collect(&:to_s)
-        @references_table_name = @references_column_names.shift
+        @to_table, @primary_key = Array(expected).map(&:to_s)
       end
     end
 
     def matches?(model)
       @model = model
-      if @references_table_name
+      if @to_table
         @result = @model.foreign_keys.select do |fk|
-          fk.references_table_name == @references_table_name &&
-            @references_column_names.empty? ? true : fk.references_column_names == @references_column_names
+          fk.to_table == @to_table &&
+            @primary_key.blank? ? true : fk.primary_key == @primary_key
         end
       else
         @result = @model.foreign_keys
       end
-      @result.keep_if {|fk| fk.column_names == @column_names } if @column_names
+      @result.keep_if {|fk| Array.wrap(fk.column) == @column } if @column
       @result.keep_if {|fk| fk.on_update == @on_update } if @on_update
       @result.keep_if {|fk| fk.on_delete == @on_delete } if @on_delete
       @result.keep_if {|fk| fk.deferrable == @deferrable } if @deferrable
@@ -28,10 +27,10 @@ module SchemaPlusMatchers
     end
 
     def failure_message(should_not = false)
-      target_column_names = @column_names.present? ? "(#{@column_names.join(', ')})" : ""
-      destinantion_column_names = @references_table_name ? "#{@references_table_name}(#{@references_column_names.join(', ')})" : "anything"
+      target_column = @column.present? ? "(#{Array.wrap(@column).join(', ')})" : ""
+      destinantion_column = @to_table ? "#{@to_table}(#{Array.wrap(@primary_key).join(', ')})" : "anything"
       invert = should_not ? 'not' : ''
-      msg = "Expected #{@model.table_name}#{target_column_names} to #{invert} reference #{destinantion_column_names}"
+      msg = "Expected #{@model.table_name}#{target_column} to #{invert} reference #{destinantion_column}"
       with = []
       with << "on_update=#{@on_update.inspect}" if @on_update
       with << "on_delete=#{@on_delete.inspect}" if @on_delete
@@ -45,8 +44,8 @@ module SchemaPlusMatchers
       failure_message(true)
     end
 
-    def on(*column_names)
-      @column_names = column_names.collect(&:to_s)
+    def on(*column)
+      @column = column.collect(&:to_s)
       self
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus
 version: !ruby/object:Gem::Version
-  version: 1.8.9
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-23 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +28,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -45,20 +45,68 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: schema_monkey
+  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
+    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_pg_indexes
+  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_dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,20 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: its-it
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    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.'
@@ -161,68 +195,79 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - gemfiles/Gemfile.base
-- 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
-- gemfiles/rails-4.0/Gemfile.base
-- gemfiles/rails-4.0/Gemfile.mysql2
-- gemfiles/rails-4.0/Gemfile.postgresql
-- gemfiles/rails-4.0/Gemfile.sqlite3
-- gemfiles/rails-4.1/Gemfile.base
-- gemfiles/rails-4.1/Gemfile.mysql2
-- gemfiles/rails-4.1/Gemfile.postgresql
-- gemfiles/rails-4.1/Gemfile.sqlite3
 - gemfiles/rails-4.2/Gemfile.base
 - gemfiles/rails-4.2/Gemfile.mysql2
 - 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
+- lib/schema_db_default.rb
+- lib/schema_db_default/active_record/attribute.rb
+- 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/postgresql_adapter.rb
+- lib/schema_default_expr/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_default_expr/middleware.rb
+- lib/schema_pg_enums.rb
+- lib/schema_pg_enums/active_record.rb
+- lib/schema_pg_enums/middleware.rb
 - lib/schema_plus.rb
-- lib/schema_plus/active_record/attribute.rb
 - lib/schema_plus/active_record/base.rb
-- lib/schema_plus/active_record/column_options_handler.rb
 - lib/schema_plus/active_record/connection_adapters/abstract_adapter.rb
-- lib/schema_plus/active_record/connection_adapters/column.rb
 - lib/schema_plus/active_record/connection_adapters/foreign_key_definition.rb
-- lib/schema_plus/active_record/connection_adapters/index_definition.rb
 - lib/schema_plus/active_record/connection_adapters/mysql_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
 - 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/migration/command_recorder.rb
 - lib/schema_plus/active_record/schema.rb
-- lib/schema_plus/active_record/schema_dumper.rb
-- lib/schema_plus/railtie.rb
+- lib/schema_plus/middleware/dumper.rb
+- lib/schema_plus/middleware/migration.rb
+- lib/schema_plus/middleware/model.rb
 - 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/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/postgresql_adapter.rb
+- lib/schema_views/active_record/connection_adapters/sqlite3_adapter.rb
+- lib/schema_views/middleware.rb
 - schema_dev.yml
 - schema_plus.gemspec
-- spec/column_default_spec.rb
-- spec/column_spec.rb
 - spec/connection_spec.rb
-- spec/enum_spec.rb
 - spec/foreign_key_definition_spec.rb
 - spec/foreign_key_spec.rb
-- spec/index_definition_spec.rb
-- spec/index_spec.rb
 - spec/migration_spec.rb
 - spec/named_schemas_spec.rb
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
+- spec/schema_column_plus/column_spec.rb
+- spec/schema_db_default/column_spec.rb
+- spec/schema_default_expr/column_default_spec.rb
+- spec/schema_default_expr/schema_dumper_spec.rb
 - spec/schema_dumper_spec.rb
+- spec/schema_pg_enums/enum_spec.rb
+- spec/schema_pg_enums/schema_dumper_spec.rb
 - spec/schema_spec.rb
+- spec/schema_views/named_schemas_spec.rb
+- spec/schema_views/views_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb
 - spec/support/matchers/have_index.rb
 - spec/support/matchers/reference.rb
-- spec/views_spec.rb
 homepage: https://github.com/SchemaPlus/schema_plus
 licenses:
 - MIT
@@ -238,9 +283,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: schema_plus
 rubygems_version: 2.2.2
@@ -249,23 +294,25 @@ specification_version: 4
 summary: Enhances ActiveRecord schema mechanism, including more DRY index creation
   and support for foreign key constraints and views.
 test_files:
-- spec/column_default_spec.rb
-- spec/column_spec.rb
 - spec/connection_spec.rb
-- spec/enum_spec.rb
 - spec/foreign_key_definition_spec.rb
 - spec/foreign_key_spec.rb
-- spec/index_definition_spec.rb
-- spec/index_spec.rb
 - spec/migration_spec.rb
 - spec/named_schemas_spec.rb
 - spec/schema/auto_schema.rb
 - spec/schema/core_schema.rb
+- spec/schema_column_plus/column_spec.rb
+- spec/schema_db_default/column_spec.rb
+- spec/schema_default_expr/column_default_spec.rb
+- spec/schema_default_expr/schema_dumper_spec.rb
 - spec/schema_dumper_spec.rb
+- spec/schema_pg_enums/enum_spec.rb
+- spec/schema_pg_enums/schema_dumper_spec.rb
 - spec/schema_spec.rb
+- spec/schema_views/named_schemas_spec.rb
+- spec/schema_views/views_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/support/matchers/automatic_foreign_key_matchers.rb
 - spec/support/matchers/have_index.rb
 - spec/support/matchers/reference.rb
-- spec/views_spec.rb