notifiable-rails 0.19.3 → 0.19.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28d39b459daed63027ffe36633510ce234f343d4
-  data.tar.gz: 9617fab405a153ddd3b0df2ccdc7e33528f553cb
+  metadata.gz: 8a1e54e45f4a3b6bed44aee9c110e26d5c297f47
+  data.tar.gz: 1848c6bdb6b0f445d52517f41c07725933881d46
 SHA512:
-  metadata.gz: c4e3b0c8f4cec9faa43f7295ab0dfed2328a2016900e2392c06e434893b3659aed97563e8647e5c22d01d9babeffec8cdfab3d3c86ac4ba33bfe6b3f1dca1b6d
-  data.tar.gz: d2cea2b3879309b57056ea0cb1390818cf34de298f4ecdf3e3377380886d999625839a08b0ec0d7a623ae1028bc84dc0fd3010e56a8144c1629b8e97a845bdf1
+  metadata.gz: ca963fd3b6d4e46d12d37e4dd85b3c17f53b035dbc2b269b1a6c95b046f4c8ec206efe5021c3cd4269be314f2bbc1e53bdd81bfe44c36d1f0d44df6e0c29457e
+  data.tar.gz: ce3c2a2b9cc64155b92e0fa546c1e4a108ca4d3f40806f8592afa47d40f40b6e7a4351a64df8a13d0fee44e7c98159e2e288f7cc0ccaa892741af843efb61bf3

data/lib/notifiable/active_record.rb

@@ -8,18 +8,17 @@ class ActiveRecord::Base
     when :mysql
       raise NotImplementedError, "Not implemented type '#{adapter_type}'"
     when :sqlite
-      sqlite_bulk_insert(record_list)
+      self.create(record_list)
     when :postgresql
-      postgresql_bulk_insert(record_list)
+      self.connection.execute(postgresql_bulk_insert_sql(record_list))      
     when :oracleenhanced
-      oracle_bulk_insert(record_list)
+      self.connection.execute(oracle_bulk_insert_sql(record_list))
     else
       raise NotImplementedError, "Unknown adapter type '#{adapter_type}' for ActiveRecord::Base.bulk_insert!"
     end
-    
   end
   
-  protected
+  protected  
   def self.convert_record_list(record_list)
     key_list = record_list.map(&:keys).flatten.uniq.sort
 
@@ -32,20 +31,20 @@ class ActiveRecord::Base
     return [key_list, value_list]
   end
   
-  def self.sqlite_bulk_insert(record_list)
-    self.create record_list
-  end
-  
-  def self.postgresql_bulk_insert(record_list)
+  def self.postgresql_bulk_insert_sql(record_list)
     key_list, value_list = convert_record_list(record_list)        
-    sql = "INSERT INTO #{self.table_name} (#{key_list.join(", ")}) VALUES #{value_list.map {|rec| "(#{rec.join(", ")})" }.join(" ,")}"
-    self.connection.insert_sql(sql)
+    "INSERT INTO #{self.table_name} (#{key_list.join(", ")}) VALUES #{value_list.map {|rec| "(#{rec.join(", ")})" }.join(" ,")}"
   end
   
-  def self.oracle_bulk_insert(record_list)
-    key_list, value_list = convert_record_list(record_list)        
-    sql = "INSERT INTO #{self.table_name} (#{key_list.join(", ")}) VALUES (bind variables #{value_list.map {|rec| "(#{rec.join(", ")})" }.join(" ,")})"
-    self.connection.execute(sql)
+  def self.oracle_bulk_insert_sql(record_list)
+    key_list, value_list = convert_record_list(record_list)  
+    
+    inserts = []
+    value_list.each do |rec|
+      inserts << "INTO #{self.table_name} (#{key_list.join(", ")}) VALUES (#{rec.join(", ")})"
+    end 
+    
+    "INSERT ALL #{inserts.join(' ')}"   
   end
   
 end

data/lib/notifiable/version.rb

@@ -1,3 +1,3 @@
 module Notifiable
-  VERSION = "0.19.3"
+  VERSION = "0.19.4"
 end

data/spec/active_record_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe ActiveRecord::Base do
+
+  let(:notification_status) { FactoryGirl.build(:notification_status) }
+  let(:notification_status2) { FactoryGirl.build(:notification_status) }
+  
+  it "generates correct Oracle Enchanced Bulk SQL" do 
+    date = DateTime.now
+    sql = Notifiable::NotificationStatus.send(:oracle_bulk_insert_sql, 
+      [{notification_id: notification_status.notification.id, device_token_id: notification_status.device_token.id, status: 0, created_at: date},
+      {notification_id: notification_status2.notification.id, device_token_id: notification_status2.device_token.id, status: 0, created_at: date}])
+    
+      sql.should eql "INSERT ALL INTO notifiable_statuses (created_at, device_token_id, notification_id, status) VALUES (#{ActiveRecord::Base.connection.quote(date)}, 1, 1, 0) INTO notifiable_statuses (created_at, device_token_id, notification_id, status) VALUES (#{ActiveRecord::Base.connection.quote(date)}, 2, 2, 0)"
+  end
+end

data/spec/support/factories.rb

@@ -21,6 +21,7 @@ FactoryGirl.define do
   factory :notification_status, :class => Notifiable::NotificationStatus do
     notification
     status 0
+    association :device_token, factory: :mock_token
   end
   
   sequence(:email) {|n| "person-#{n}@example.com" }