schema_plus_core 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3806c727340fbe9c4e3d221bbe8b8e4108ff778
-  data.tar.gz: 5cb2449c108f65e9dd358503962595d345b99751
+  metadata.gz: 52e38bdd3b1c4e571c13dd1622d788e26a7482d2
+  data.tar.gz: fc308fc51c0e41a39bab240d5cd398bad57973eb
 SHA512:
-  metadata.gz: c5468384823546f1aac60cd719418f7e788dc18f2f50f1c5d9a69b79b93b118cdad1db8208c9c512557b9751a64fb6803a960c0b935caf9cf2f8f60f9828e2a4
-  data.tar.gz: 057827181ff824af179a4e8581e24eda5b62982e75583b56e01e18355fef78338ffd7a8ac5a0af559b8adcb8a50ab0ced69e8158cc94bb458a42a3ef106f8049
+  metadata.gz: 1907077811c3f92a40bf70c99fb5a2a5fbcdb336238206d06e2eb4b841cc87dd9c992909e2eee89da7f5d9cf6a450d3ffd43f638fa019b288ffba26f40b334d9
+  data.tar.gz: 98f844ac096c11fb8f592ad9fdf9e2e2d4438a5293907943f181fcc77acee326fa4f066288911b56f45b51133a64f2131dcb0f81f91ee0ba2ab573604ab50261

data/README.md

@@ -369,6 +369,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
   * `table.indexes = []` - an array of SchemaDump::Table::Index objects
   * `table.statements` - a collection of statements to include in the table definition; each is a string that should start with `"t."`
   * `table.trailer` - a collection of migration statements to include immediately outside the table definition.  Each is a string
+  * `table.alt` - In some cases, ActiveRecord is unable to dump a table in the form of a migration `create_table` statement; in this case `table.pname` will be nil, and `table.alt` will contain the alternate string to dump instead. (E.g. if the table contains custom types, ActiveRecord will be unable to handle it and will just dump an error message as a comment.)
 
 * `Class SchemaPlus::Core::SchemaDump::Table::Column`
 
@@ -450,6 +451,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
 ## History
 
+* 0.6.0 Added `table.alt` to dumper; Bug fix: Don't crash when AR fails to dump a table. Thanks to [@stenver](https://github.com/stenver) for tracking it down
 * 0.5.1 Bug fix: Don't choke on a quoted newline in a `CREATE TABLE` statement ([#3](https://github.com/SchemaPlus/schema_plus_core/pull/3)).  Thanks to [@mikeauclair](https://github.com/mikeauclair) 
 * 0.5.0 Added `Migration::DropTable`
 * 0.4.0 Added `implements_reference` to `Migration::Column` stack env

data/lib/schema_plus/core/active_record/schema_dumper.rb

@@ -60,20 +60,24 @@ module SchemaPlus
             (?<trailer>.*)
             \Z
             }xm
-            env.table.pname = m[:name]
-            env.table.options = m[:options].strip
-            env.table.trailer = m[:trailer].split("\n").map(&:strip).reject{|s| s.blank?}
-            env.table.columns = m[:columns].strip.split("\n").map { |col|
-              m = col.strip.match %r{
-              ^
-              t\.(?<type>\S+) \s*
-                [:'"](?<name>[^"\s]+)[,"]? \s*
-                ,? \s*
-                (?<options>.*)
-              $
-              }x
-              SchemaDump::Table::Column.new(name: m[:name], type: m[:type], options: m[:options])
-            }
+            if m.nil?
+              env.table.alt = stream.string
+            else
+              env.table.pname = m[:name]
+              env.table.options = m[:options].strip
+              env.table.trailer = m[:trailer].split("\n").map(&:strip).reject{|s| s.blank?}
+              env.table.columns = m[:columns].strip.split("\n").map { |col|
+                m = col.strip.match %r{
+                ^
+                t\.(?<type>\S+) \s*
+                  [:'"](?<name>[^"\s]+)[,"]? \s*
+                  ,? \s*
+                  (?<options>.*)
+                $
+                }x
+                SchemaDump::Table::Column.new(name: m[:name], type: m[:type], options: m[:options])
+              }
+            end
           end
         end
 

data/lib/schema_plus/core/schema_dump.rb

@@ -43,7 +43,7 @@ module SchemaPlus
         @dependencies[tablename].sort.uniq.reject{|t| @dumper.ignored? t}.each(&block)
       end
 
-      class Table < KeyStruct[:name, :pname, :options, :columns, :indexes, :statements, :trailer]
+      class Table < KeyStruct[:name, :pname, :options, :columns, :indexes, :statements, :trailer, :alt]
         def initialize(*args)
           super
           self.columns ||= []
@@ -53,6 +53,11 @@ module SchemaPlus
         end
 
         def assemble(stream)
+          if pname.nil?
+            stream.puts alt
+            stream.puts ""
+            return
+          end
           stream.write "  create_table #{pname.inspect}"
           stream.write ", #{options}" unless options.blank?
           stream.puts " do |t|"

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "0.5.1"
+    VERSION = "0.6.0"
   end
 end

data/spec/dumper_spec.rb

@@ -1,9 +1,65 @@
 require 'spec_helper'
 
+module TestDumper
+  module Middleware
+    module Dumper
+      module Initial
+        include Enableable
+        def after(env)
+          return unless middleware = enabled_middleware(TestDumper, env)
+          env.initial.unshift middleware.to_s
+        end
+      end
+      module Tables
+        include Enableable
+        def after(env)
+          return unless middleware = enabled_middleware(TestDumper, env)
+          env.dump.tables[middleware.to_s] = env.dump.tables.values.first.dup.tap {|t| t.pname = middleware.to_s }
+          env.dump.depends("things", middleware.to_s)
+          env.dump.depends(middleware.to_s, "other")
+        end
+      end
+      module Table
+        include Enableable
+        def after(env)
+          return unless middleware = enabled_middleware(TestDumper, env)
+          if column = env.table.columns.first
+            column.add_option "option: #{middleware}"
+            column.add_comment "comment: #{middleware}"
+          end
+          env.table.statements << "statement: #{middleware}"
+          env.table.trailer << "trailer: #{middleware}"
+        end
+      end
+      module Indexes
+        include Enableable
+        def after(env)
+          return unless env.table.indexes.any?
+          return unless middleware = enabled_middleware(TestDumper, env)
+          env.table.indexes.first.add_option middleware.to_s
+        end
+      end
+    end
+  end
+end
+
+SchemaMonkey.register(TestDumper)
+
 describe SchemaMonkey::Middleware::Dumper do
 
   let(:migration) { ::ActiveRecord::Migration }
 
+  TestCustomType = SchemaDev::Rspec::Helpers.postgresql?
+
+  around(:each) do |example|
+    begin
+      migration.execute "CREATE TYPE custom_type AS ENUM ('a', 'b')";
+      example.run
+    ensure
+      migration.execute "DROP TYPE IF EXISTS custom_type CASCADE";
+    end
+  end if TestCustomType
+
   before(:each) do
     migration.create_table "things" do |t|
       t.integer :column
@@ -13,6 +69,7 @@ describe SchemaMonkey::Middleware::Dumper do
       t.references :thing
     end
     migration.add_foreign_key("other", "things")
+    migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)" if TestCustomType
   end
 
   context TestDumper::Middleware::Dumper::Initial do
@@ -26,6 +83,7 @@ describe SchemaMonkey::Middleware::Dumper do
   context TestDumper::Middleware::Dumper::Table do
     Then { expect(dump).to match(/t[.]integer.*option: #{middleware} \# comment: #{middleware}/) }
     Then { expect(dump).to match(/statement: #{middleware}\s+end\s+(add_index.*)?\s+trailer: #{middleware}/) }
+    Then { expect(dump).to match(/could not dump table.*custom_table.*unknown type.*custom_type/mi) } if TestCustomType
   end
 
   context TestDumper::Middleware::Dumper::Indexes do
@@ -41,7 +99,7 @@ describe SchemaMonkey::Middleware::Dumper do
 
   def dump
     begin
-      middleware.enable
+      middleware.enable once:false
       stream = StringIO.new
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
       return stream.string

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -178,7 +178,6 @@ files:
 - spec/spec_helper.rb
 - spec/sql_struct_spec.rb
 - spec/support/enableable.rb
-- spec/support/test_dumper.rb
 - spec/support/test_reporter.rb
 homepage: https://github.com/SchemaPlus/schema_plus_core
 licenses:
@@ -211,5 +210,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/sql_struct_spec.rb
 - spec/support/enableable.rb
-- spec/support/test_dumper.rb
 - spec/support/test_reporter.rb

data/spec/support/test_dumper.rb

@@ -1,42 +0,0 @@
-module TestDumper
-  module Middleware
-    module Dumper
-      module Initial
-        include Enableable
-        def after(env)
-          return unless middleware = enabled_middleware(TestDumper, env)
-          env.initial.unshift middleware.to_s
-        end
-      end
-      module Tables
-        include Enableable
-        def after(env)
-          return unless middleware = enabled_middleware(TestDumper, env)
-          env.dump.tables[middleware.to_s] = env.dump.tables.values.first.dup.tap {|t| t.pname = middleware.to_s }
-          env.dump.depends("things", middleware.to_s)
-          env.dump.depends(middleware.to_s, "other")
-        end
-      end
-      module Table
-        include Enableable
-        def after(env)
-          return unless middleware = enabled_middleware(TestDumper, env)
-          env.table.columns.first.add_option "option: #{middleware}"
-          env.table.columns.first.add_comment "comment: #{middleware}"
-          env.table.statements << "statement: #{middleware}"
-          env.table.trailer << "trailer: #{middleware}"
-        end
-      end
-      module Indexes
-        include Enableable
-        def after(env)
-          return unless env.table.indexes.any?
-          return unless middleware = enabled_middleware(TestDumper, env)
-          env.table.indexes.first.add_option middleware.to_s
-        end
-      end
-    end
-  end
-end
-
-SchemaMonkey.register(TestDumper)