schema_plus 2.0.0.pre8 → 2.0.0.pre9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f841ad3a38cc1fc65ca2ddf36fdd44568165445
-  data.tar.gz: bc199b47eb9924938016e662d9c060417fa817ba
+  metadata.gz: 61e2c68d4c34a1a67e9dd384a88b39a1c51ac28b
+  data.tar.gz: 2d6b58497e571c08e38ce563a74f56b5d1f9a5d3
 SHA512:
-  metadata.gz: 0b081af031147830bde1beba8c2481ec9c987b8d8d529b1383cf234e900bfec973ef9adfa5123df5d919975da4a91ef3680fc8553874698b0cb7830bbfc64933
-  data.tar.gz: 91e463eea4332315156e6a1444f5b599f496f72211c2b907191f749b3c4b0e19283759d643c649e023de7d19b6699a54ea8e276273ac2433e9a34f78bc4f0d3c
+  metadata.gz: 70b083aec779efb9afebd741e24ef825d99f0c4dfdd89e416cd3cd4d61f38238a40541e8182dae1de155a96cb5abdd71082666024c145600b391dfc5169cbea5
+  data.tar.gz: fa3810d8ba0c11444928631f3d285303c76f1b8bfe272c495cdf82bff2e84285253159d3e51a34c861f0d4adfed5e922fc67ef65eead4b682d83d6397600e97d

data/README.md

@@ -20,7 +20,7 @@ Gem | Description | Included In `schema_plus` gem?
 [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
 <p style="color:grey">schema_plus_default_expr</p> | Use SQL expressions for database default values | Y
-<p style="color:grey">schema_plus_enums</p> | Use enum types in migrations | 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
 [schema_plus_pg_indexes](https://github.com/SchemaPlus/schema_plus_pg_indexes) |PostgreSQL index features: `case_insenstive`, `expression` and `operator_class` | Y

data/lib/schema_plus/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlus
-  VERSION = "2.0.0.pre8"
+  VERSION = "2.0.0.pre9"
 end

data/schema_plus.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "schema_plus_core", "~> 0.2"
   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_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.pre8
+  version: 2.0.0.pre9
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -81,6 +81,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: schema_plus_enums
+  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
@@ -268,9 +282,6 @@ files:
 - 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/enums.rb
-- lib/schema_plus/enums/active_record.rb
-- lib/schema_plus/enums/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
@@ -296,8 +307,6 @@ files:
 - 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_enums/enum_spec.rb
-- spec/schema_plus_enums/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
@@ -341,8 +350,6 @@ test_files:
 - 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_enums/enum_spec.rb
-- spec/schema_plus_enums/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/enums.rb

@@ -1,6 +0,0 @@
-require 'schema_plus/core'
-
-require_relative 'enums/active_record'
-require_relative 'enums/middleware'
-
-SchemaMonkey.register SchemaPlus::Enums

data/lib/schema_plus/enums/active_record.rb

@@ -1,69 +0,0 @@
-module SchemaPlus::Enums
-  module ActiveRecord
-    module ConnectionAdapters
-      module PostgresqlAdapter
-
-        def enums
-          result = query(<<-SQL)
-            SELECT
-              N.nspname AS schema_name,
-              T.typname AS enum_name,
-              E.enumlabel AS enum_label,
-              E.enumsortorder AS enum_sort_order
-              --array_agg(E.enumlabel ORDER BY enumsortorder) AS labels
-            FROM pg_type T
-            JOIN pg_enum E ON E.enumtypid = T.oid
-            JOIN pg_namespace N ON N.oid = T.typnamespace
-            ORDER BY 1, 2, 4
-          SQL
-
-          result.reduce([]) do |res, row|
-            last = res.last
-            if last && last[0] == row[0] && last[1] == row[1]
-              last[2] << row[2]
-            else
-              res << (row[0..1] << [row[2]])
-            end
-            res
-          end
-        end
-
-        def create_enum(name, *values)
-          options = values.extract_options!
-          list = values.map { |value| escape_enum_value(value) }
-          execute "CREATE TYPE #{enum_name(name, options[:schema])} AS ENUM (#{list.join(',')})"
-        end
-
-        def alter_enum(name, value, options = {})
-          opts = case
-                 when options[:before] then "BEFORE #{escape_enum_value(options[:before])}"
-                 when options[:after] then "AFTER #{escape_enum_value(options[:after])}"
-                 else
-                   ''
-                 end
-          execute "ALTER TYPE #{enum_name(name, options[:schema])} ADD VALUE #{escape_enum_value(value)} #{opts}"
-        end
-
-        def drop_enum(name, options = {})
-          execute "DROP TYPE #{enum_name(name, options[:schema])}"
-        end
-
-        private
-
-        def enum_name(name, schema)
-          [schema || 'public', name].map { |s|
-            %Q{"#{s}"}
-          }.join('.')
-        end
-
-        def escape_enum_value(value)
-          escaped_value = value.sub("'", "''")
-          "'#{escaped_value}'"
-        end
-
-
-      end
-    end
-  end
-end
-

data/lib/schema_plus/enums/middleware.rb

@@ -1,22 +0,0 @@
-module SchemaPlus::Enums
-  module Middleware
-
-    module Dumper
-      module Initial
-
-        module Postgresql
-
-          def after(env)
-            env.connection.enums.each do |schema, name, values|
-              params = [name.inspect]
-              params << values.map(&:inspect).join(', ')
-              params << ":schema => #{schema.inspect}" if schema != 'public'
-
-              env.initial << "create_enum #{params.join(', ')}"
-            end
-          end
-        end
-      end
-    end
-  end
-end

data/spec/schema_plus_enums/enum_spec.rb

@@ -1,132 +0,0 @@
-require 'spec_helper'
-
-def enum_fields(name, schema = 'public')
-  sql = <<-SQL
-    SELECT array_to_string(array_agg(E.enumlabel ORDER BY enumsortorder), ' ') AS "values"
-    FROM pg_enum E
-    JOIN pg_type T ON E.enumtypid = T.oid
-    JOIN pg_namespace N ON N.oid = T.typnamespace
-    WHERE N.nspname = '#{schema}' AND T.typname = '#{name}'
-    GROUP BY T.oid;
-  SQL
-
-  data = ActiveRecord::Base.connection.select_all(sql)
-  return nil if data.empty?
-  data[0]['values'].split(' ')
-end
-
-describe 'enum', :postgresql => :only do
-  before(:all) do ActiveRecord::Migration.verbose = false end
-
-  let(:migration) { ActiveRecord::Migration }
-
-  describe 'enums' do
-    it 'should return all enums' do
-      begin
-        migration.execute 'create schema cmyk'
-        migration.create_enum 'color', 'red', 'green', 'blue'
-        migration.create_enum 'color', 'cyan', 'magenta', 'yellow', 'black', schema: 'cmyk'
-
-        expect(migration.enums).to match_array [['cmyk', 'color', %w|cyan magenta yellow black|], ['public', 'color', %w|red green blue|]]
-      ensure
-        migration.drop_enum 'color'
-        migration.execute 'drop schema cmyk cascade'
-      end
-    end
-  end
-
-  describe 'create_enum' do
-    it 'should create enum with given values' do
-      begin
-        migration.create_enum 'color', *%w|red green blue|
-        expect(enum_fields('color')).to eq(%w|red green blue|)
-      ensure
-        migration.execute 'DROP TYPE IF EXISTS color'
-      end
-    end
-
-    it 'should create enum with schema' do
-      begin
-        migration.execute 'CREATE SCHEMA colors'
-        migration.create_enum 'color', *%|red green blue|, schema: 'colors'
-        expect(enum_fields('color', 'colors')).to eq(%w|red green blue|)
-      ensure
-        migration.execute 'DROP SCHEMA IF EXISTS colors CASCADE'
-      end
-    end
-
-    it 'should escape enum value' do
-      begin
-        migration.create_enum('names', "O'Neal")
-        expect(enum_fields('names')).to eq(["O'Neal"])
-      ensure
-        migration.execute "DROP TYPE IF EXISTS names"
-      end
-    end
-
-    it 'should escape schame name and enum name' do
-      begin
-        migration.execute 'CREATE SCHEMA "select"'
-        migration.create_enum 'where', *%|red green blue|, schema: 'select'
-        expect(enum_fields('where', 'select')).to eq(%w|red green blue|)
-      ensure
-        migration.execute 'DROP SCHEMA IF EXISTS "select" CASCADE'
-      end
-    end
-
-  end
-
-  describe 'alter_enum' do
-    before(:each) do migration.create_enum('color', 'red', 'green', 'blue') end
-    after(:each) do migration.execute 'DROP TYPE IF EXISTS color' end
-
-    it 'should add new value after all values' do
-      migration.alter_enum('color', 'magenta')
-      expect(enum_fields('color')).to eq(%w|red green blue magenta|)
-    end
-
-    it 'should add new value after existed' do
-      migration.alter_enum('color', 'magenta', after: 'red')
-      expect(enum_fields('color')).to eq(%w|red magenta green blue|)
-    end
-
-    it 'should add new value before existed' do
-      migration.alter_enum('color', 'magenta', before: 'green')
-      expect(enum_fields('color')).to eq(%w|red magenta green blue|)
-    end
-
-    it 'should add new value within given schema' do
-      begin
-        migration.execute 'CREATE SCHEMA colors'
-        migration.create_enum('color', 'red', schema: 'colors')
-        migration.alter_enum('color', 'green', schema: 'colors')
-
-        expect(enum_fields('color', 'colors')).to eq(%w|red green|)
-      ensure
-        migration.execute 'DROP SCHEMA colors CASCADE'
-      end
-    end
-  end
-
-  describe 'drop_enum' do
-    it 'should drop enum with given name' do
-      migration.execute "CREATE TYPE color AS ENUM ('red', 'blue')"
-      expect(enum_fields('color')).to eq(%w|red blue|)
-      migration.drop_enum('color')
-
-      expect(enum_fields('color')).to be_nil
-    end
-
-    it 'should drop enum within given name and schema' do
-      begin
-        migration.execute "CREATE SCHEMA colors; CREATE TYPE colors.color AS ENUM ('red', 'blue')"
-        expect(enum_fields('color', 'colors')).to eq(%w|red blue|)
-        migration.drop_enum('color', schema: 'colors')
-
-        expect(enum_fields('color', 'colors')).to be_nil
-      ensure
-        migration.execute "DROP SCHEMA colors CASCADE"
-      end
-    end
-  end
-end

data/spec/schema_plus_enums/schema_dumper_spec.rb

@@ -1,37 +0,0 @@
-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