baza 0.0.2 → 0.0.3

data/README.rdoc

@@ -107,6 +107,18 @@ Or a specific column:
     end
   end
 
+== Query Buffer
+In order to speed things up, but without using transactions directly, you can use a query buffer. This stores various instructions in memory and flushes them every now and then through transactions or intelligent queries (like multi-insertion). The drawback is that it will not be possible to test the queries for errors before a flush is executed and it wont be possible to read results form any of the queries. It is fairly simple do however:
+  db.q_buffer do |buffer|
+    100_000.times do |count|
+      buffer.insert(:table_name, {:name => "Kasper #{count}"})
+      
+      buffer.query("UPDATE table SET ...")
+      buffer.query("DELETE FROM table WHERE ...")
+    end
+  end
+
+
 == Contributing to baza
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/baza.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
-  s.date = "2013-04-16"
+  s.date = "2013-04-17"
   s.description = "A database abstraction layer, model framework and database framework."
   s.email = "kj@gfish.com"
   s.extra_rdoc_files = [

data/include/db.rb

@@ -435,13 +435,19 @@ class Baza::Db
   end
   
   #Checks if a given selector exists. If it does, updates it to match data. If not inserts the row.
-  def upsert(table, selector, data)
+  def upsert(table, selector, data, args = nil)
     row = self.select(table, selector, "limit" => 1).fetch
     
+    if args and args[:buffer]
+      obj = args[:buffer]
+    else
+      obj = self
+    end
+    
     if row
-      self.update(table, data, selector)
+      obj.update(table, data, selector)
     else
-      self.insert(table, selector.merge(data))
+      obj.insert(table, selector.merge(data))
     end
   end
   

data/include/query_buffer.rb

@@ -33,7 +33,7 @@ class Baza::QueryBuffer
   end
   
   #Delete as on a normal Baza::Db.
-  #===Examples
+  #===Example
   # db.q_buffer do |buffer|
   #   buffer.delete(:users, {:id => 5})
   # end
@@ -43,6 +43,16 @@ class Baza::QueryBuffer
     return nil
   end
   
+  #Update as on a normal Baza::Db.
+  #===Example
+  # db.q_buffer do |buffer|
+  #   buffer.update(:users, {:name => "Kasper"}, {:id => 5})
+  # end
+  def update(table, update, terms)
+    STDOUT.puts "Update called on table #{table}." if @debug
+    self.query(@args[:db].update(table, update, terms, :return_sql => true))
+  end
+  
   #Plans to inset a hash into a table. It will only be inserted when flush is called.
   #===Examples
   # db.q_buffer do |buffer|
@@ -64,20 +74,22 @@ class Baza::QueryBuffer
     return nil if @queries_count <= 0
     
     @lock.synchronize do
-      @args[:db].transaction do
-        @queries.shift(1000).each do |str|
-          STDOUT.print "Executing via buffer: #{str}\n" if @debug
-          @args[:db].q(str)
-        end
-        
-        @inserts.each do |table, datas_arr|
-          while !datas_arr.empty?
-            datas_chunk_arr = datas_arr.shift(1000)
-            @args[:db].insert_multi(table, datas_chunk_arr)
+      if !@queries.empty?
+        @args[:db].transaction do
+          @queries.shift(1000).each do |str|
+            STDOUT.print "Executing via buffer: #{str}\n" if @debug
+            @args[:db].q(str)
           end
         end
       end
       
+      @inserts.each do |table, datas_arr|
+        while !datas_arr.empty?
+          datas_chunk_arr = datas_arr.shift(1000)
+          @args[:db].insert_multi(table, datas_chunk_arr)
+        end
+      end
+      
       @inserts.clear
       @queries_count = 0
     end

data/lib/baza.rb

@@ -1,7 +1,8 @@
 class Baza
   #Autoloader for subclasses.
   def self.const_missing(name)
-    require "#{File.dirname(__FILE__)}/../include/#{name.to_s.downcase}.rb"
+    file_name = name.to_s.gsub(/(.)([A-Z])/,'\1_\2').downcase
+    require "#{File.dirname(__FILE__)}/../include/#{file_name}.rb"
     raise "Still not defined: '#{name}'." if !Baza.const_defined?(name)
     return Baza.const_get(name)
   end

data/spec/baza_spec.rb

@@ -291,6 +291,49 @@ describe "Baza" do
         count_found.should eql(10000)
       end
     end
+    
+    it "should be able to use query buffers" do
+      driver[:const].sample_db do |db|
+        db.tables.create(:test_table, {
+          :columns => [
+            {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
+            {:name => :name, :type => :varchar}
+          ]
+        })
+        
+        db.q_buffer do |buffer|
+          10000.times do |count|
+            buffer.insert(:test_table, {:name => "Kasper #{count}"})
+          end
+        end
+        
+        test_table = db.tables[:test_table]
+        test_table.rows_count.should eql(10000)
+        
+        db.q_buffer do |buffer|
+          count = 0
+          db.select(:test_table, {}, :orderby => :id) do |row|
+            row[:name].should eql("Kasper #{count}")
+            buffer.update(:test_table, {:name => "Kasper #{count}-#{count}"}, {:id => row[:id]})
+            count += 1
+          end
+        end
+        
+        count = 0
+        db.select(:test_table, {}, :orderby => :id) do |row|
+          row[:name].should eql("Kasper #{count}-#{count}")
+          count += 1
+        end
+        
+        db.q_buffer do |buffer|
+          db.select(:test_table) do |row|
+            buffer.delete(:test_table, {:id => row[:id]})
+          end
+        end
+        
+        test_table.rows_count.should eql(0)
+      end
+    end
   end
   
   it "should be able to connect to mysql and do various stuff" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datet
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3309657141000385200
+      hash: 2097963653998790721
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: