seed-fu 2.0.0 → 2.0.1.rails31

data/CHANGELOG.md

@@ -1,5 +1,14 @@
-Version 2.0.0 (In Development)
-------------------------------
+Version 2.0.1
+-------------
+
+Bug fixes:
+
+* Update the primary key sequence in PostgreSQL tables after seeding data. This ensures that id conflicts do not occur when records are subsequently added to the table.
+
+* Raise ActiveRecord::RecordNotSaved if any of the saves fail (but they won't fail due to validation since saves are done without validation, so this guards against callbacks failing etc.)
+
+Version 2.0.0
+-------------
 
 Features:
 

data/README.md

@@ -137,7 +137,7 @@ If you need to programmatically generate seed files, for example to convert a CS
 Bugs / Feature requests
 -----------------------
 
-Please report them [on Lighthouse](http://mbleigh.lighthouseapp.com/projects/10223-seed-fu).
+Please report them on [Github Issues](https://github.com/mbleigh/seed-fu/issues).
 
 Contributors
 ------------

data/lib/seed-fu.rb

@@ -1,4 +1,5 @@
 require 'active_record'
+require 'active_support/core_ext/module/attribute_accessors'
 require 'seed-fu/railtie' if defined?(Rails) && Rails.version >= "3"
 
 module SeedFu

data/lib/seed-fu/seeder.rb

@@ -32,9 +32,11 @@ module SeedFu
     # Insert/update the records as appropriate. Validation is skipped while saving.
     # @return [Array<ActiveRecord::Base>] The records which have been seeded
     def seed
-      @model_class.transaction do
+      records = @model_class.transaction do
         @data.map { |record_data| seed_record(record_data.symbolize_keys) }
       end
+      update_id_sequence
+      records
     end
 
     private
@@ -59,9 +61,11 @@ module SeedFu
       def seed_record(data)
         record = find_or_initialize_record(data)
         return if @options[:insert_only] && !record.new_record?
-        record.send(:attributes=, data, false)
+
         puts " - #{@model_class} #{data.inspect}" unless @options[:quiet]
-        record.save(:validate => false)
+
+        record.send(:attributes=, data, false)
+        record.save(:validate => false) || raise(ActiveRecord::RecordNotSaved)
         record
       end
 
@@ -73,5 +77,18 @@ module SeedFu
       def constraint_conditions(data)
         Hash[@constraints.map { |c| [c, data[c.to_sym]] }]
       end
+
+      def update_id_sequence
+        if @model_class.connection.adapter_name == "PostgreSQL"
+          quoted_id       = @model_class.connection.quote_column_name(@model_class.primary_key)
+          quoted_sequence = "'" + @model_class.sequence_name + "'"
+          @model_class.connection.execute(
+            "SELECT pg_catalog.setval(" +
+              "#{quoted_sequence}," +
+              "(SELECT MAX(#{quoted_id}) FROM #{@model_class.quoted_table_name}) + 1" +
+            ");"
+          )
+        end
+      end
   end
 end

data/lib/seed-fu/version.rb

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

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: seed-fu
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  - rails31
+  version: 2.0.1.rails31
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-05 00:00:00 +00:00
+date: 2010-12-26 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,15 +29,32 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
+        - 1
         - 0
-        - 0
-        version: 3.0.0
+        - beta
+        version: 3.1.0.beta
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        - 0
+        - beta
+        version: 3.1.0.beta
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -44,14 +62,39 @@ dependencies:
         segments: 
         - 2
         - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: pg
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
         - 0
-        version: 2.0.0
+        version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,7 +103,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id006
 description: Seed Fu is an attempt to once and for all solve the problem of inserting and maintaining seed data in a database. It uses a variety of techniques gathered from various places around the web and combines them to create what is hopefully the most robust seed data system around.
 email: 
 - michael@intridea.com
@@ -104,11 +147,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: