schema_plus_core 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fdcb1b5d55bc09bdff0ca89474a8e550d35b020
-  data.tar.gz: ae536eca65f37ce4eb3686edf7eae712efdfc72d
+  metadata.gz: 3e8e79d68457a1e4ce6d7ff39807855e36cd2e9a
+  data.tar.gz: 5155f4e1926b764f3170c699eafb3e4cb789ecf9
 SHA512:
-  metadata.gz: 35f641bf268e73aacf8922e078b3e37a8f03ec35dbc4116f2cc9421f374e9a457059f934b52290392a48aceda41c3b63018974238c4d1188533b99b40e958c92
-  data.tar.gz: eab9a007c118a5f0875c7e1299182c075c306e61d6756a33b4c1dd3eab216760f49780477c914efea55d3d694ec5bdea3a161332cae72e6b55e76f08eda38c19
+  metadata.gz: cb5a7d23d7ab4f2fbb0c750386f4c5b721f9d8f4f72331290368569bbeba44e0da640c56b30c96728aa410e81bf9b39997fa9c214b835ca3e07ed62519da604e
+  data.tar.gz: 6e4369733968625498dcf83a73748640f2af0e9456fd9a2b045bc9052977850b3b597f1d00240af92001e163370e3556480d853103768a52ead5e4ed5b746ae7

data/.travis.yml

@@ -5,7 +5,8 @@
 ---
 sudo: false
 rvm:
-- 2.3.1
+- 2.4.4
+- 2.5.1
 gemfile:
 - gemfiles/activerecord-5.0/Gemfile.mysql2
 - gemfiles/activerecord-5.0/Gemfile.postgresql
@@ -13,6 +14,9 @@ gemfile:
 - gemfiles/activerecord-5.1/Gemfile.mysql2
 - gemfiles/activerecord-5.1/Gemfile.postgresql
 - gemfiles/activerecord-5.1/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -23,8 +23,12 @@ SchemaPlus::Core is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.4.4** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.4.4** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.4.4** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.5.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.5.1** with activerecord **5.1**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.5.1** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -127,7 +131,6 @@ Stacks for general operations queries pertaining to the entire database schema:
     `:index_definitions` | The result of the lookup                     | `[]`
     `:connection`        | The current ActiveRecord connection          | *context*
     `:table_name`        | The name of the table to query               | *arg*
-    `:query_name`        | Label sometimes used by ActiveRecord logging | *arg*
 
   The base implementation appends its results to `env.index_definitions`
 
@@ -441,6 +444,7 @@ SchemaPlus::Core provides a state object and of callbacks to various phases of t
 
 ## Release Notes
 
+* 2.2.0 Added AR5.2 support.  Thanks to [@jeremyyap](https://github.com/jeremyyap)
 * 2.1.1 Bug fix: Don't lose habtm options.  Thanks to [@iagopiimenta ](https://github.com/iagopiimenta)
 * 2.1.0 Added AR5.1 support.  Thanks to [@iagopiimenta ](https://github.com/iagopiimenta)
 * 2.0.1 Tighten up AR dependency.  Thanks to [@myabc](https://github.com/myabc).

data/gemfiles/activerecord-5.2/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

data/gemfiles/activerecord-5.2/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/core.rb

@@ -26,4 +26,8 @@ require_relative "core/schema_dump"
 require_relative "core/sql_struct"
 require_relative "core/version"
 
+if ActiveRecord.version >= Gem::Version.new('5.2.0.rc1')
+  require_relative "core/active_record/connection_adapters/postgresql/schema_dumper"
+end
+
 SchemaMonkey.register(SchemaPlus::Core)

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

@@ -20,13 +20,13 @@ module SchemaPlus
           # don't have a documented return value.  But at least one gem
           # (https://github.com/hzamani/active_record-acts_as/blob/master/lib/active_record/acts_as/relation.rb#L14)
           # relies on the undocumented return value.
-          def has_many(name, scope = nil, options = {}, &extension)
+          def has_many(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
               env.result = super(env.name, env.scope, env.options, &env.extension)
             end.result
           end
 
-          def has_one(name, scope = nil, options = {}, &extension)
+          def has_one(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
               env.result = super(env.name, env.scope, env.options, &env.extension)
             end.result
@@ -38,7 +38,7 @@ module SchemaPlus
             end.result
           end
 
-          def belongs_to(name, scope = nil, options = {}, &extension)
+          def belongs_to(name, scope = nil, **options, &extension)
             SchemaMonkey::Middleware::Model::Association::Declaration.start(model: self, name: name, scope: scope, options: options, extension: extension) do |env|
               env.result = super(env.name, env.scope, env.options, &env.extension)
             end.result

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

@@ -28,9 +28,9 @@ module SchemaPlus
             end
           end
 
-          def indexes(table_name, query_name=nil)
-            SchemaMonkey::Middleware::Schema::Indexes.start(connection: self, table_name: table_name, query_name: query_name, index_definitions: []) { |env|
-              env.index_definitions += super env.table_name, env.query_name
+          def indexes(table_name)
+            SchemaMonkey::Middleware::Schema::Indexes.start(connection: self, table_name: table_name, index_definitions: []) { |env|
+              env.index_definitions += super env.table_name
             }.index_definitions
           end
 
@@ -73,4 +73,3 @@ module SchemaPlus
     end
   end
 end
-

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

@@ -0,0 +1,40 @@
+module SchemaPlus
+  module Core
+    module ActiveRecord
+      module ConnectionAdapters
+        module PostgreSQL
+          module PostgreSQL # need two PostgreSQLs because the first gets stripped by schema_monkey
+            module SchemaDumper
+
+              # 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, *) # :nodoc:
+                spec = super
+                spec[:default] = "%q{#{column.default_function}}" if column.default_function
+                spec
+              end
+
+              def extensions(_)
+                SchemaMonkey::Middleware::Dumper::Initial.start(dumper: self, connection: @connection, dump: @dump, initial: @dump.initial) do |env|
+                  stream = StringIO.new
+                  super stream
+                  env.dump.initial << stream.string unless stream.string.blank?
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module SchemaPlus
           # 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.  
+          # escaped properly.
           #
           # Arguably that's a bug in AR, but then again default function
           # expressions don't work well in AR anyway.  (hence
@@ -58,9 +58,9 @@ module SchemaPlus
             }.result
           end
 
-          def indexes(table_name, query_name=nil)
-            SchemaMonkey::Middleware::Schema::Indexes.start(connection: self, table_name: table_name, query_name: query_name, index_definitions: []) { |env|
-              env.index_definitions += super env.table_name, env.query_name
+          def indexes(table_name)
+            SchemaMonkey::Middleware::Schema::Indexes.start(connection: self, table_name: table_name, index_definitions: []) { |env|
+              env.index_definitions += super env.table_name
             }.index_definitions
           end
 

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

@@ -28,9 +28,9 @@ module SchemaPlus
             }.result
           end
 
-          def indexes(table_name, query_name=nil)
-            SchemaMonkey::Middleware::Schema::Indexes.start(connection: self, table_name: table_name, query_name: query_name, index_definitions: []) { |env|
-              env.index_definitions += super env.table_name, env.query_name
+          def indexes(table_name)
+            SchemaMonkey::Middleware::Schema::Indexes.start(connection: self, table_name: table_name, index_definitions: []) { |env|
+              env.index_definitions += super env.table_name
             }.index_definitions
           end
 
@@ -44,5 +44,3 @@ module SchemaPlus
     end
   end
 end
-
-

data/lib/schema_plus/core/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Core
-    VERSION = "2.1.1"
+    VERSION = "2.2.0"
   end
 end

data/schema_dev.yml

@@ -1,8 +1,10 @@
 ruby:
-    - 2.3.1
+    - 2.4.4
+    - 2.5.1
 activerecord:
     - 5.0
     - 5.1
+    - 5.2
 db:
     - mysql2
     - sqlite3

data/schema_plus_core.gemspec

@@ -26,7 +26,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.7"
+  gem.add_development_dependency "schema_dev", "~> 3.11"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
   gem.add_development_dependency "its-it"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_core
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2018-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '3.11'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -187,10 +187,15 @@ files:
 - gemfiles/activerecord-5.1/Gemfile.mysql2
 - gemfiles/activerecord-5.1/Gemfile.postgresql
 - gemfiles/activerecord-5.1/Gemfile.sqlite3
+- gemfiles/activerecord-5.2/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
 - lib/schema_plus/core.rb
 - lib/schema_plus/core/active_record/base.rb
 - lib/schema_plus/core/active_record/connection_adapters/abstract_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/mysql2_adapter.rb
+- lib/schema_plus/core/active_record/connection_adapters/postgresql/schema_dumper.rb
 - lib/schema_plus/core/active_record/connection_adapters/postgresql_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/core/active_record/connection_adapters/table_definition.rb