vorpal 0.0.6.rc3 → 0.0.6.rc4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDJjYTFiMjk0N2U4NmYxYjI4NGIwMmY0N2VkOWZiYjRjZjI4OTFlOA==
+    OGZhMWQ2MGM3ZWZlZTJhZjkxOGVlMmZiYTkzODk4NTljNzk5NjU0MA==
   data.tar.gz: !binary |-
-    OWJjZDM0Y2JiMGIzNGNlY2MxOWFmNDQwYWUyZTRiMDJiNDBkNmZmYw==
+    ZDMxYTEyMzI5OTQ0YmJkNDJmNjg3OGZjNzc5NDE2ZGUyNjc0M2Y4ZA==
 SHA512:
   metadata.gz: !binary |-
-    NmU3YTQ2OGNkYzZjNTM3ODMxODc5NjlhZjFhOWFlMmNkMjRmMzg1NGE0ZGRm
-    MGY3MWRlZjM0ZjFlOWFhNzI0N2Q2MzMwODMyYzFkODJlMzExZjBmZTAzNGE0
-    NmUzODFkMWU3M2IzN2NhODA3YzZhMDU1OTllZjEyNzJlY2Q0ODI=
+    M2QxM2JlYWQ0NGE5Njg3YWZhYmI4MjdmNmVlZjVhZGIzOTA1YTZjMDYzYzVj
+    ZGViNjM3ZDI2YTY5MGNkZGRhZmNkMmI2YjUxZDYwYTVjYmI1ZjA5ZmVmNTgx
+    ZGIxZTZjZTQzYTQ2NzQ4ZWMxNWM2OThmYzIzNjAzMjYxNTVkMTE=
   data.tar.gz: !binary |-
-    MWY5NzQ0N2Q2NjE5NDI4MmE4MzRmMDM4ZjI3M2M4NjQ1MTBhYzA4MWY3YTJm
-    YmQxNDI2MTcwOWRkYmRlNjcwYTNiN2E4N2I1ZWU4ZmZiYTZkMWU1ZDE2NmZh
-    NjA0OWJmMDg2Y2M4NDYzYzVhNjg5MTE0YTAzMTg4NDkzOTNmNTQ=
+    ZmExNTU3NGNiYmM1YjIxZjg3M2VlNjU0ODJmY2NjNmZlYTRkMDcyZTYzZTNm
+    YTkyZDUxMTI2NGI4MzhjYzg5NjBiMWNmNGUwOTI1ZWIzZDc5MDRiM2RmMmQx
+    MzEzYmI0ZWRmYzYyZjgyYjFmOTI5NDA3YTYzMzJlYmZkMzc1YzU=

data/lib/vorpal/aggregate_repository.rb

@@ -102,7 +102,7 @@ class AggregateRepository
     return roots if roots.empty?
     loaded_db_objects = load_owned_from_db(roots.map(&:id), roots.first.class)
     loaded_db_objects.each do |config, db_objects|
-      @db_driver.destroy(config.db_class, db_objects)
+      @db_driver.destroy(config, db_objects)
     end
     roots
   end
@@ -114,7 +114,7 @@ class AggregateRepository
   end
 
   def load_from_db(ids, domain_class, only_owned=false)
-    DbLoader.new(@configs, only_owned, @db_driver).load_from_db(ids, domain_class)
+    DbLoader.new(only_owned, @db_driver).load_from_db(ids, @configs.config_for(domain_class))
   end
 
   def load_owned_from_db(ids, domain_class)
@@ -171,7 +171,7 @@ class AggregateRepository
   def set_primary_keys(owned_objects, mapping)
     owned_objects.each do |config, objects|
       in_need_of_primary_keys = objects.find_all { |obj| obj.id.nil? }
-      primary_keys = @db_driver.get_primary_keys(config.db_class, in_need_of_primary_keys.length)
+      primary_keys = @db_driver.get_primary_keys(config, in_need_of_primary_keys.length)
       in_need_of_primary_keys.zip(primary_keys).each do |object, primary_key|
         mapping[object].id = primary_key
         object.id = primary_key
@@ -212,11 +212,11 @@ class AggregateRepository
     owned_objects.each do |config, objects|
       objects_to_insert = grouped_new_objects[config] || []
       db_objects_to_insert = objects_to_insert.map { |obj| mapping[obj] }
-      @db_driver.insert(config.db_class, db_objects_to_insert)
+      @db_driver.insert(config, db_objects_to_insert)
 
       objects_to_update = objects - objects_to_insert
       db_objects_to_update = objects_to_update.map { |obj| mapping[obj] }
-      @db_driver.update(config.db_class, db_objects_to_update)
+      @db_driver.update(config, db_objects_to_update)
     end
   end
 
@@ -226,7 +226,7 @@ class AggregateRepository
     all_orphans = db_objects_in_db - db_objects_in_aggregate
     grouped_orphans = all_orphans.group_by { |o| @configs.config_for_db_object(o) }
     grouped_orphans.each do |config, orphans|
-      @db_driver.destroy(config.db_class, orphans)
+      @db_driver.destroy(config, orphans)
     end
   end
 

data/lib/vorpal/db_driver.rb

@@ -1,8 +1,12 @@
 module Vorpal
   class DbDriver
-    def insert(db_class, db_objects)
+    def initialize
+      @sequence_names = {}
+    end
+
+    def insert(class_config, db_objects)
       if defined? ActiveRecord::Import
-        db_class.import(db_objects, validate: false)
+        class_config.db_class.import(db_objects, validate: false)
       else
         db_objects.each do |db_object|
           db_object.save!(validate: false)
@@ -10,39 +14,43 @@ module Vorpal
       end
     end
 
-    def update(db_class, db_objects)
+    def update(class_config, db_objects)
       db_objects.each do |db_object|
         db_object.save!(validate: false)
       end
     end
 
-    def destroy(db_class, db_objects)
-      db_class.delete_all(id: db_objects.map(&:id))
+    def destroy(class_config, db_objects)
+      class_config.db_class.delete_all(id: db_objects.map(&:id))
     end
 
-    def load_by_id(db_class, ids)
-      db_class.where(id: ids)
+    def load_by_id(class_config, ids)
+      class_config.db_class.where(id: ids)
     end
 
-    def load_by_foreign_key(db_class, id, foreign_key_info)
-      arel = db_class.where(foreign_key_info.fk_column => id)
+    def load_by_foreign_key(class_config, id, foreign_key_info)
+      arel = class_config.db_class.where(foreign_key_info.fk_column => id)
       arel = arel.where(foreign_key_info.fk_type_column => foreign_key_info.fk_type) if foreign_key_info.polymorphic?
       arel.order(:id).all
     end
 
-    def get_primary_keys(db_class, count)
-      result = execute("select nextval('#{sequence_name(db_class)}') from generate_series(1,#{count});")
-      result.column_values(0).map(&:to_i)
+    def get_primary_keys(class_config, count)
+      result = execute("select nextval($1) from generate_series(1,$2);", [sequence_name(class_config), count])
+      result.rows.map(&:first).map(&:to_i)
     end
 
     private
 
-    def execute(sql)
-      ActiveRecord::Base.connection.execute(sql)
+    def sequence_name(class_config)
+      @sequence_names[class_config] ||= execute(
+        "SELECT substring(column_default from '''(.*)''') FROM INFORMATION_SCHEMA.COLUMNS WHERE table_name = $1 AND column_name = 'id' LIMIT 1",
+        [class_config.db_class.table_name]
+      ).rows.first.first
     end
 
-    def sequence_name(db_class)
-      "#{db_class.table_name}_id_seq"
+    def execute(sql, binds)
+      binds = binds.map { |row| [nil, row] }
+      ActiveRecord::Base.connection.exec_query(sql, 'SQL', binds)
     end
   end
 end

data/lib/vorpal/db_loader.rb

@@ -8,23 +8,21 @@ module Vorpal
 #
 # @private
 class DbLoader
-  def initialize(configs, only_owned, driver)
-    @configs = configs
+  def initialize(only_owned, db_driver)
     @only_owned = only_owned
-    @driver = driver
+    @db_driver = db_driver
   end
 
-  def load_from_db(ids, domain_class)
-    config = @configs.config_for(domain_class)
+  def load_from_db(ids, config)
     @loaded_objects = LoadedObjects.new
     @lookup_instructions = LookupInstructions.new
     @lookup_instructions.lookup_by_id(config, ids)
 
     until @lookup_instructions.empty?
       lookup = @lookup_instructions.next_lookup
-      new_objects = lookup.load_all(@driver)
+      new_objects = lookup.load_all(@db_driver)
       @loaded_objects.add(lookup.config, new_objects)
-      explore_objects(new_objects)
+      explore_objects(lookup.config, new_objects)
     end
 
     @loaded_objects
@@ -32,9 +30,8 @@ class DbLoader
 
   private
 
-  def explore_objects(objects_to_explore)
+  def explore_objects(config, objects_to_explore)
     objects_to_explore.each do |db_object|
-      config = @configs.config_for_db_object(db_object)
       config.has_manys.each do |has_many_config|
         lookup_by_fk(db_object, has_many_config) if explore_association?(has_many_config)
       end
@@ -119,9 +116,9 @@ class LookupById
     @ids = ids
   end
 
-  def load_all(driver)
+  def load_all(db_driver)
     return [] if @ids.empty?
-    driver.load_by_id(@config.db_class, @ids)
+    db_driver.load_by_id(@config, @ids)
   end
 end
 
@@ -134,9 +131,9 @@ class LookupByFk
     @fk_values = fk_values
   end
 
-  def load_all(driver)
+  def load_all(db_driver)
     return [] if @fk_values.empty?
-    driver.load_by_foreign_key(@config.db_class, @fk_values, @fk_info)
+    db_driver.load_by_foreign_key(@config, @fk_values, @fk_info)
   end
 end
 

data/lib/vorpal/version.rb

@@ -1,3 +1,3 @@
 module Vorpal
-  VERSION = "0.0.6.rc3"
+  VERSION = "0.0.6.rc4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vorpal
 version: !ruby/object:Gem::Version
-  version: 0.0.6.rc3
+  version: 0.0.6.rc4
 platform: ruby
 authors:
 - Sean Kirby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_serializer