seed-fu 2.3.5 → 2.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf0b349552818b1e0816c832ab879a54205077b
-  data.tar.gz: d82820f5982dd340803aec6a93ec9ed129bfed86
+  metadata.gz: ad9b8e7488b40ad21cde92fdca4bcf1b49f0337b
+  data.tar.gz: c959103cfa27bec53d50054105cc434616542c5a
 SHA512:
-  metadata.gz: ed62dad601a12df2f560467ab20573030cb6374ad1d6902c4cfcb65c06d0fc2383c2af204468496fe9ca7cb5efb76b7b98c507a792515286c8db9a0540ace59b
-  data.tar.gz: 658aeb3750737acd802652548673caa05250a07655df199b37ae7985b898e249970dc83056396bc9ecd12ec821416d069f10162c1ad38676070a4b4bcf89aec6
+  metadata.gz: 421610d7bbb46e2c7dedb5732e4a4d9c9b90760a655445c3ba397026a93942305c87308480b43863ee925fcca5d2a9bba53e788ae9140620f1b88e481f1b6f95
+  data.tar.gz: 495a61ad3ada421366a699e2943804fc4883e41b03da47b7c431565aa1fada06aaaaa98bee16416d7b86c57c7888ddb27484e8ecb218d01f7ab0ce69b3fa7a8e

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+Version 2.3.8
+-------------
+
+Bug fixes:
+
+* Restored support for PostgreSQL with Rails versions before 5.0.0 broken in Seed Fu 2.3.7.
+
+Version 2.3.7
+-------------
+
+Features:
+
+* Postgresql >= 10.0 support
+
+Version 2.3.6
+-------------
+
+Features:
+
+* Rails 5.0 support
+
 Version 2.3.5
 -------------
 

data/README.md

@@ -39,7 +39,7 @@ Basic Example
 Installation
 ------------
 
-### Rails 3.1, 3.2, 4.0, 4.1
+### Rails 3.1, 3.2, 4.0, 4.1, 4.2, 5.0
 
 Just add `gem 'seed-fu', '~> 2.3'` to your `Gemfile`
 

data/lib/seed-fu/seeder.rb

@@ -76,7 +76,7 @@ module SeedFu
       end
 
       def find_or_initialize_record(data)
-        @model_class.where(constraint_conditions(data)).first ||
+        @model_class.where(constraint_conditions(data)).take ||
         @model_class.new
       end
 
@@ -85,15 +85,24 @@ module SeedFu
       end
 
       def update_id_sequence
-        if @model_class.connection.adapter_name == "PostgreSQL"
+        if @model_class.connection.adapter_name == "PostgreSQL" or @model_class.connection.adapter_name == "PostGIS"
           return if @model_class.primary_key.nil? || @model_class.sequence_name.nil?
 
           quoted_id       = @model_class.connection.quote_column_name(@model_class.primary_key)
           sequence = @model_class.sequence_name
 
-          @model_class.connection.execute <<-EOS
-            SELECT setval('#{sequence}', (SELECT GREATEST(MAX(#{quoted_id})+(SELECT increment_by FROM #{sequence}), (SELECT min_value FROM #{sequence})) FROM #{@model_class.quoted_table_name}), false)
-          EOS
+          # TODO postgresql_version was made public in Rails 5.0.0, remove #send when support for earlier versions are dropped
+          if @model_class.connection.send(:postgresql_version) >= 100000
+            sql =<<-EOS
+              SELECT setval('#{sequence}', (SELECT GREATEST(MAX(#{quoted_id})+(SELECT seqincrement FROM pg_sequence WHERE seqrelid = '#{sequence}'::regclass), (SELECT seqmin FROM pg_sequence WHERE seqrelid = '#{sequence}'::regclass)) FROM #{@model_class.quoted_table_name}), false)
+            EOS
+          else
+            sql =<<-EOS
+              SELECT setval('#{sequence}', (SELECT GREATEST(MAX(#{quoted_id})+(SELECT increment_by FROM #{sequence}), (SELECT min_value FROM #{sequence})) FROM #{@model_class.quoted_table_name}), false)
+            EOS
+          end
+
+          @model_class.connection.execute sql
         end
       end
   end

data/lib/seed-fu/version.rb

@@ -1,4 +1,4 @@
 module SeedFu
   # The current version of Seed Fu
-  VERSION = '2.3.5'
+  VERSION = '2.3.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: seed-fu
 version: !ruby/object:Gem::Version
-  version: 2.3.5
+  version: 2.3.9
 platform: ruby
 authors:
 - Michael Bleigh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2018-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,9 +18,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,9 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -38,9 +32,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -48,9 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +122,8 @@ files:
 - lib/tasks/seed_fu.rake
 - lib/tasks/seed_fu_capistrano3.rake
 homepage: http://github.com/mbleigh/seed-fu
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -152,9 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Easily manage seed data in your Active Record application
 test_files: []
-has_rdoc: