rapids 0.1.2 → 0.1.3

data/lib/rapids/batch/create_trigger.rb

@@ -6,9 +6,10 @@ module Rapids
     class CreateTrigger
       include ModelExtensions
       
-      def initialize(model,batch_definition)
+      def initialize(model,batch_definition,options = {})
         @model = model
         @batch = batch_definition
+        @options = options
       end
 
       def to_sql
@@ -29,7 +30,7 @@ module Rapids
             
             #{find_or_create_sql(@model,@batch.find_or_creates)}
             
-            insert into `#{@model.table_name}` (#{insert_header.join(",")})
+            #{@options[:replace] ? "replace" : "insert"} into `#{@model.table_name}` (#{insert_header.join(",")})
                                         values (#{insert_values.join(",")});
           end
         TRIGGER_SQL

data/lib/rapids/batch/insert_into.rb

@@ -6,10 +6,11 @@ module Rapids
     class InsertInto
       include ModelExtensions
       
-      def initialize(model,batch_definition,values)
+      def initialize(model,batch_definition,values,options = {})
         @model = model
         @batch = batch_definition
         @values = values
+        @options = options
       end
       
       def to_sql

data/lib/rapids/batch.rb

@@ -17,14 +17,14 @@ module Rapids
       end
     end
     
-    def batch_create(collection)
+    def batch_create(collection,options = {})
       drop_batch_table_if_exists
       
       create_batch_table
       
-      create_batch_trigger
+      create_batch_trigger(options)
       
-      batch_insert(collection)
+      batch_insert(collection,options)
     end
     
     def batch(&block)
@@ -44,14 +44,14 @@ module Rapids
       connection.execute(create_table.to_sql)
     end
     
-    def create_batch_trigger
-      create_trigger = CreateTrigger.new(self,@batch)
-      
+    def create_batch_trigger(options)
+      create_trigger = CreateTrigger.new(self,@batch,options)
+
       connection.execute(create_trigger.to_sql)
     end
     
-    def batch_insert(values)
-      insert_into = InsertInto.new(self,@batch,values)
+    def batch_insert(values,options)
+      insert_into = InsertInto.new(self,@batch,values,options)
 
       connection.execute(insert_into.to_sql)
     end

data/lib/rapids/version.rb

@@ -1,3 +1,3 @@
 module Rapids
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/batch/create_trigger_spec.rb

@@ -32,5 +32,12 @@ module Rapids::Batch
       create_trigger = CreateTrigger.new(Post,batch)
       clean_sql(create_trigger.to_sql).should == "create trigger `$posts_batch_trigger` after insert on `$posts_batch` for each row\nbegin\ndeclare find_or_create$AltCategory integer;\nselect id from `alt_categories` where `name` <=> new.`foc$AltCategory$name` into find_or_create$AltCategory;\nif find_or_create$AltCategory is null then\ninsert into alt_categories (`name`)\nvalues (new.`foc$AltCategory$name`);\nend if;\ninsert into `posts` (`author_id`,`category`,`name`)\nvalues (new.`author_id`,new.`category`,new.`name`);\nend"
     end
+    
+    it "should generate sql for a replace insert instead" do
+      batch = Rapids::Batch::DefineBatch.new
+      
+      create_trigger = CreateTrigger.new(Category,batch,:replace => true)
+      clean_sql(create_trigger.to_sql).should == "create trigger `$categories_batch_trigger` after insert on `$categories_batch` for each row\nbegin\nreplace into `categories` (`category`)\nvalues (new.`category`);\nend"
+    end
   end
 end

data/spec/batch/insert_into_spec.rb

@@ -39,6 +39,16 @@ module Rapids::Batch
       clean_sql(insert_into.to_sql).should == "INSERT INTO `$posts_batch` (`foc$AltCategory$name`,`author_id`,`category`,`name`) VALUES ('food',NULL,'food','Dining at 323 Butter St')"
     end
     
+    it "should generate sql and ignore the replace option" do
+      batch = Rapids::Batch::DefineBatch.new
+      collection = %w{food politics}.map do |category_name|
+        Category.new(:category => category_name)
+      end
+      
+      insert_into = InsertInto.new(Category,batch,collection,:replace => true)
+      clean_sql(insert_into.to_sql).should == "INSERT INTO `$categories_batch` (`category`) VALUES ('food'),('politics')"
+    end
+    
     describe "Without model objects" do
       it "should generate sql for a simple batch definition" do
         batch = Rapids::Batch::DefineBatch.new

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rapids
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 -04:00
+date: 2011-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency