baza 0.0.7 → 0.0.8

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/baza.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

data/include/db.rb

@@ -195,7 +195,7 @@ class Baza::Db
   
   #Clones the current database-connection with possible extra arguments.
   def clone_conn(args = {})
-    conn = Baza::Db.new(@opts.clone.merge(args))
+    conn = Baza::Db.new(opts = @opts.clone.merge(args))
     
     if block_given?
       begin
@@ -609,7 +609,7 @@ class Baza::Db
       end
     end
     
-    raise "Could not figure out how to find a driver to use?"
+    raise "Could not figure out which driver to use?"
   end
   
   #Executes a query and returns the result.
@@ -835,6 +835,8 @@ class Baza::Db
     self.conn_exec do |driver|
       driver.transaction(&block)
     end
+    
+    return nil
   end
   
   #Optimizes all tables in the database.

data/include/drivers/mysql/mysql.rb

@@ -397,8 +397,10 @@ class Baza::Driver::Mysql
     
     begin
       yield(@knjdb)
-    ensure
       @knjdb.q("COMMIT")
+    rescue
+      @knjdb.q("ROLLBACK")
+      raise
     end
   end
 end

data/include/query_buffer.rb

@@ -15,12 +15,25 @@ class Baza::QueryBuffer
     STDOUT.puts "Query buffer started." if @debug
     
     if block_given?
-			begin
-				yield(self)
-			ensure
-				self.flush
-        thread_async_join
-			end
+      if @args[:flush_async]
+        @args[:db].clone_conn do |db_flush_async|
+          @db_flush_async = db_flush_async
+          
+          begin
+            yield(self)
+          ensure
+            flush
+            thread_async_join
+          end
+        end
+      else
+        begin
+			    yield(self)
+        ensure
+          flush
+          thread_async_join
+        end
+      end
 		end
   end
   
@@ -32,7 +45,7 @@ class Baza::QueryBuffer
       @queries_count += 1
     end
     
-    self.flush if @queries_count >= 1000
+    flush if @queries_count >= 1000
     return nil
   end
   
@@ -41,7 +54,7 @@ class Baza::QueryBuffer
   # buffer.delete(:users, {:id => 5})
   def delete(table, where)
     STDOUT.puts "Delete called on table #{table} with arguments: '#{where}'." if @debug
-    self.query(@args[:db].delete(table, where, :return_sql => true))
+    query(@args[:db].delete(table, where, :return_sql => true))
     return nil
   end
   
@@ -50,7 +63,7 @@ class Baza::QueryBuffer
   # buffer.update(:users, {:name => "Kasper"}, {:id => 5})
   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))
+    query(@args[:db].update(table, update, terms, :return_sql => true))
     return nil
   end
   
@@ -66,7 +79,7 @@ class Baza::QueryBuffer
   #===Examples
   # buffer.insert(:users, {:name => "John Doe"})
   def insert(table, data)
-    self.query(@args[:db].insert(table, data, :return_sql => true))
+    query(@args[:db].insert(table, data, :return_sql => true))
     return nil
   end
   
@@ -86,7 +99,12 @@ class Baza::QueryBuffer
     thread_async_join
     
     @thread_async = Thread.new do
-      flush_real
+      begin
+        flush_real(@db_flush_async)
+      rescue => e
+        $stderr.puts e.inspect
+        $stderr.puts e.backtrace
+      end
     end
   end
   
@@ -97,16 +115,17 @@ class Baza::QueryBuffer
   end
   
   #Flushes the queries for real.
-  def flush_real
+  def flush_real(db = nil)
     return nil if @queries_count <= 0
+    db = @args[:db] if db == nil
     
     @lock.synchronize do
       if !@queries.empty?
         while !@queries.empty?
-          @args[:db].transaction do
+          db.transaction do
             @queries.shift(1000).each do |str|
               STDOUT.print "Executing via buffer: #{str}\n" if @debug
-              @args[:db].q(str)
+              db.q(str)
             end
           end
         end
@@ -115,7 +134,7 @@ class Baza::QueryBuffer
       @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)
+          @db.insert_multi(table, datas_chunk_arr)
         end
       end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -235,7 +235,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3943301269923844356
+      hash: 3231877095185720850
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: