schema_plus_core 0.6.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d71c54452ec75e70a08f2147dee0399dd7d5254
-  data.tar.gz: 894a9d00c4de01e2e2d6a4b0c9f023ebd8c6fd0b
+  metadata.gz: 931e01737ac5749b51d990bfa8114372d6c2d136
+  data.tar.gz: af03d82fa6dbd69359cd92a85ddb2d0f074a3ac5
 SHA512:
-  metadata.gz: 6fdffd10cc18ba2031dba7b03aaccd6db5ad2744c24ae17caf8bd474196f68dc4d1a33fe1e7912085c8913f01c4cb19b6ffd5dad7d60f3915e0e742bdd4bc60e
-  data.tar.gz: 8d8dbcb1d7bee92a34e4e65156f56d25f2004ce8819235d368c5f22c8e3a29ce7f4375cadd80ca02bd81ce4bff9f3135190a7fc5c504ea7df0f625f1640d0902
+  metadata.gz: 39cdbc108fffe0448e25985532abe46ae8ba94297990fdd4a59893d3977c72227d479832136a3471785dc0b5713cb9ac29a0aeb58d6dc896e693a3c99d0156e5
+  data.tar.gz: 57f38c4464a784504498225f021346e3aeb1226100e7e7deccef7d622d11f8015a504d0d94aa955991cdcc6d0d70958d29320052243a6d656f4ee2a8ed77d0d8

data/.gitignore

@@ -3,6 +3,7 @@
 /pkg
 /Gemfile.local
 
+.byebug_history
 *.lock
 *.log
 *.sqlite3

data/README.md

@@ -101,7 +101,7 @@ Stacks for general operations queries pertaining to the entire database schema:
 * `Schema::Define`
 
   Wrapper around the `ActiveRecord::Schema.define` method loads a dumped schema file (`schema.rb`).
-  
+
     Env Field    | Description | Initial value
     --- | --- | ---
     `:info` | Schema information hash | *args*
@@ -377,10 +377,8 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
   * `column.name` - the column name
   * `column.type` - the column type (i.e., what comes after `"t."`)
-  * `column.options` - an optional string containing the options for the column
-  * `column.comments` - an optional string containing a comment to put in the schema dump
-  * `column.add_option(option)` - adds an option to the current string, separating with a "," if the current set isn't blank
-  * `column.add_comment(comment)` - adds an option to the current string, separating with a ";" if the current string isn't blank
+  * `column.options` - a hash containing the options for the column
+  * `column.comments` - an array of comment strings for the column
 
 * `Class SchemaPlus::Core::SchemaDump::Table::Index`
 
@@ -388,8 +386,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
   * `index.name` - the index name
   * `index.columns` - the columns that are in the index
-  * `index.options` - an optional string containing the options for the index
-  * `index.add_option(option)` - adds an option to the current string, separating with a "," if the current set isn't blank
+  * `index.options` - a hash containing the options for the column
 
 #### Schema Dump Middleware stacks
 
@@ -450,14 +447,15 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
   The base method appends the collection of SchemaDump::Table::Index objects to `env.table.indexes`
 
 ## History
+* 1.0.0 Clean up `SchemaDump::Table::Column` and `SchemaDump::Table::Index` API:  `#options` is now a hash and `#comments` is now an array; no longer have `add_option` and `add_comment` methods.
 * 0.6.2 Bug fix: don't choke on INHERITANCE in table definition (#7).  Thanks to [@ADone](https://github.com/ADone).
 * 0.6.1 Make sure to require pathname (#5)
 * 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.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
-* 0.3.1 Pass along (undocumented) return values from association declarations ([#2](https://github.com/SchemaPlus/schema_plus_core/pull/2)).  Thanks to [@lowjoel](https://github.com/lowjoel) 
-* 0.3.0 Added `Model::Association::Declaration` ([#1](https://github.com/SchemaPlus/schema_plus_core/pull/1)).  Thanks to [@lowjoel](https://github.com/lowjoel). 
+* 0.3.1 Pass along (undocumented) return values from association declarations ([#2](https://github.com/SchemaPlus/schema_plus_core/pull/2)).  Thanks to [@lowjoel](https://github.com/lowjoel)
+* 0.3.0 Added `Model::Association::Declaration` ([#1](https://github.com/SchemaPlus/schema_plus_core/pull/1)).  Thanks to [@lowjoel](https://github.com/lowjoel).
 * 0.2.1 Added `Migration::CreateTable` and `Schema::Define`; removed dependency on (defunct) `schema_monkey_rails` gem.  [Oops, this should have been a minor version bump]
 * 0.2.0 Added `Migration::DropTable`
 * 0.1.0 Initial release

data/gemfiles/activerecord-4.2/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 4.2.6"

data/gemfiles/activerecord-4.2/Gemfile.mysql2

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "mysql2"
+  gem "mysql2", '>= 0.3.18', '< 0.5'
 end
 
 platform :jruby do
   gem 'activerecord-jdbcmysql-adapter'
-end
+end

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

@@ -4,6 +4,24 @@ module SchemaPlus
       module ConnectionAdapters
         module PostgresqlAdapter
 
+          # quick hack fix quoting of column default functions to allow eval() when we
+          # capture the stream.
+          #
+          # AR's PostgresqlAdapter#prepare_column_options wraps the
+          # function in double quotes, which doesn't work because the
+          # function itself may have doublequotes in it which don't get
+          # escaped properly.  
+          #
+          # Arguably that's a bug in AR, but then again default function
+          # expressions don't work well in AR anyway.  (hence
+          # schema_plus_default_expr )
+          #
+          def prepare_column_options(column, types) # :nodoc:
+            spec = super
+            spec[:default] = "%q{#{column.default_function}}" if column.default_function
+            spec
+          end
+
           def change_column(table_name, name, type, options = {})
             SchemaMonkey::Middleware::Migration::Column.start(caller: self, operation: :change, table_name: table_name, column_name: name, type: type, options: options.deep_dup) do |env|
               super env.table_name, env.column_name, env.type, env.options

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

@@ -75,7 +75,7 @@ module SchemaPlus
                   (?<options>.*)
                 $
                 }x
-                SchemaDump::Table::Column.new(name: m[:name], type: m[:type], options: m[:options])
+                SchemaDump::Table::Column.new name: m[:name], type: m[:type], options: eval("{" + m[:options] + "}"), comments: []
               }
             end
           end
@@ -96,7 +96,7 @@ module SchemaPlus
                 $
               }x
               columns = m[:columns].tr(%q{[]'":}, '').strip.split(/\s*,\s*/)
-              SchemaDump::Table::Index.new name: m[:name], columns: columns, options: m[:options]
+              SchemaDump::Table::Index.new name: m[:name], columns: columns, options: eval("{#{m[:options]}}")
             }
           end
         end

data/lib/schema_plus/core/schema_dump.rb

@@ -85,41 +85,25 @@ module SchemaPlus
 
         class Column < KeyStruct[:name, :type, :options, :comments]
 
-          def add_option(option)
-            self.options = [options, option].reject(&:blank?).join(', ')
-          end
-
-          def add_comment(comment)
-            self.comments = [comments, comment].reject(&:blank?).join('; ')
-          end
-
           def assemble(stream, typelen, namelen)
             stream.write "t.%-#{typelen}s " % type
             if options.blank? && comments.blank?
               stream.write name.inspect
             else
               pr = name.inspect
-              pr += "," unless options.blank?
+              pr += ',' unless options.blank?
               stream.write "%-#{namelen+3}s " % pr
             end
-            stream.write "#{options}" unless options.blank?
-            stream.write " " unless options.blank? or comments.blank?
-            stream.write "# #{comments}" unless comments.blank?
+            stream.write options.to_s.sub(/^{(.*)}$/, '\1') unless options.blank?
+            stream.write ' ' unless options.blank? or comments.blank?
+            stream.write '# ' + comments.join('; ') unless comments.blank?
           end
         end
 
         class Index < KeyStruct[:name, :columns, :options]
 
-          def add_option(option)
-            self.options = [options, option].reject(&:blank?).join(', ')
-          end
-
           def assemble(stream)
-            stream.write [
-              columns.inspect,
-              "name: #{name.inspect}",
-              options
-            ].reject(&:blank?).join(", ")
+            stream.write columns.inspect + ", " + {name: name}.merge(options).to_s.sub(/^{(.*)}$/, '\1')
           end
         end
       end

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "0.6.2"
+    VERSION = "1.0.0"
   end
 end

data/schema_plus_core.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rake", "~> 10.0"
   gem.add_development_dependency "rspec", "~> 3.0.0"
   gem.add_development_dependency "rspec-given"
-  gem.add_development_dependency "schema_dev", "~> 3.3"
+  gem.add_development_dependency "schema_dev", "~> 3.6"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
 end

data/spec/dumper_spec.rb

@@ -24,8 +24,8 @@ module TestDumper
         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}"
+            column.options[:option] = middleware.to_s
+            column.comments << "comment: #{middleware}"
           end
           env.table.statements << "statement: #{middleware}"
           env.table.trailer << "trailer: #{middleware}"
@@ -36,7 +36,7 @@ module TestDumper
         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
+          env.table.indexes.first.options[:option] = middleware.to_s
         end
       end
     end
@@ -72,6 +72,15 @@ describe SchemaMonkey::Middleware::Dumper do
     migration.execute "CREATE TABLE custom_table ( my_column custom_type DEFAULT 'a'::custom_type NOT NULL)" if TestCustomType
   end
 
+  context "column default expressions", postgresql: :only do
+
+    before(:each) do
+      migration.execute %Q{ALTER TABLE "things" ADD "defexpr" character varying DEFAULT substring((random())::text, 3, 6)}
+    end
+
+    Then { expect(dump use_middleware: false).to match(/\\"substring\\"\(\(random/) }
+  end
+
   context TestDumper::Middleware::Dumper::Initial do
     Then { expect(dump).to match(/Schema[.]define.*do\s+#{middleware}/) }
   end
@@ -81,13 +90,13 @@ describe SchemaMonkey::Middleware::Dumper do
   end
 
   context TestDumper::Middleware::Dumper::Table do
-    Then { expect(dump).to match(/t[.]integer.*option: #{middleware} \# comment: #{middleware}/) }
+    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
-    Then { expect(dump).to match(/add_index.*#{middleware}/) }
+    Then { expect(dump).to match(/add_index.*:option=>"#{middleware}"/) }
   end
 
 
@@ -97,14 +106,14 @@ describe SchemaMonkey::Middleware::Dumper do
     described_class
   end
 
-  def dump
+  def dump(use_middleware: true)
     begin
-      middleware.enable once:false
+      middleware.enable once:false if use_middleware
       stream = StringIO.new
       ActiveRecord::SchemaDumper.dump(ActiveRecord::Base.connection, stream)
       return stream.string
     ensure
-      middleware.disable
+      middleware.disable if use_middleware
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 1.0.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-16 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement