knjrbfw 0.0.8 → 0.0.9

data/lib/knj/knjdb/libknjdb.rb

@@ -1,8 +1,12 @@
 class Knj::Db
   autoload :Dbtime, "#{File.dirname(__FILE__)}/dbtime.rb"
+  autoload :Revision, "#{File.dirname(__FILE__)}/revision.rb"
+  
   attr_reader :opts, :conn, :conns, :int_types
   
   def initialize(opts)
+    require "#{$knjpath}threadhandler"
+    
     self.setOpts(opts) if opts != nil
     
     @int_types = ["int", "bigint", "tinyint", "smallint", "mediumint"]
@@ -10,6 +14,8 @@ class Knj::Db
     if !@opts[:threadsafe]
       @mutex = Mutex.new
     end
+    
+    @debug = @opts[:debug]
   end
   
   def col_table
@@ -71,24 +77,31 @@ class Knj::Db
       end
     end
     
-    return Kernel.const_get("KnjDB_" + @opts[:type]).new(self)
+    return Kernel.const_get("KnjDB_#{@opts[:type]}").new(self)
   end
   
   def get_and_register_thread
     raise "KnjDB-object is not in threadding mode." if !@conns
     
-    db = @conns.get_and_lock
+    thread_cur = Thread.current
     tid = self.__id__
-    Thread.current[:knjdb] = {} if !Thread.current[:knjdb]
-    Thread.current[:knjdb][tid] = db
+    thread_cur[:knjdb] = {} if !thread_cur[:knjdb]
+    
+    if thread_cur[:knjdb][tid]
+      #An object has already been spawned - free that first to avoid endless "used" objects.
+      self.free_thread
+    end
+    
+    thread_cur[:knjdb][tid] = @conns.get_and_lock if !thread_cur[:knjdb][tid]
   end
   
   def free_thread
+    thread_cur = Thread.current
     tid = self.__id__
     
-    if Thread.current[:knjdb] and Thread.current[:knjdb].key?(tid)
-      db = Thread.current[:knjdb][tid]
-      Thread.current[:knjdb].delete(tid)
+    if thread_cur[:knjdb] and thread_cur[:knjdb].key?(tid)
+      db = thread_cur[:knjdb][tid]
+      thread_cur[:knjdb].delete(tid)
       @conns.free(db) if @conns
     end
   end
@@ -101,8 +114,8 @@ class Knj::Db
     @conns = nil
   end
   
-  def clone_conn
-    return Knj::Db.new(@opts)
+  def clone_conn(args = {})
+    return Knj::Db.new(@opts.clone.merge(args))
   end
   
   def copy_to(db, args = {})
@@ -152,36 +165,34 @@ class Knj::Db
   end
   
   def insert(tablename, arr_insert, args = {})
-    sql = ""
-    
     conn_exec do |driver|
-      sql += "INSERT INTO #{driver.escape_table}#{tablename.to_s}#{driver.escape_table} ("
+      sql = "INSERT INTO #{driver.escape_table}#{tablename.to_s}#{driver.escape_table} ("
       
       first = true
       arr_insert.each do |key, value|
         if first
           first = false
         else
-          sql += ", "
+          sql << ", "
         end
         
-        sql += "#{driver.escape_col}#{key.to_s}#{driver.escape_col}"
+        sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col}"
       end
       
-      sql += ") VALUES ("
+      sql << ") VALUES ("
       
       first = true
       arr_insert.each do |key, value|
         if first
           first = false
         else
-          sql += ", "
+          sql << ", "
         end
         
-        sql += "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
+        sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
       end
       
-      sql += ")"
+      sql << ")"
       
       driver.query(sql)
       return driver.lastID if args[:return_id]
@@ -206,60 +217,58 @@ class Knj::Db
     
     conn_exec do |driver|
       sql = ""
-      sql += "UPDATE #{driver.escape_col}#{tablename.to_s}#{driver.escape_col} SET "
+      sql << "UPDATE #{driver.escape_col}#{tablename.to_s}#{driver.escape_col} SET "
       
       first = true
       arr_update.each do |key, value|
         if first
           first = false
         else
-          sql += ", "
+          sql << ", "
         end
         
-        sql += "#{driver.escape_col}#{key.to_s}#{driver.escape_col} = "
-        sql += "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
+        sql << "#{driver.escape_col}#{key.to_s}#{driver.escape_col} = "
+        sql << "#{driver.escape_val}#{driver.escape(value.to_s)}#{driver.escape_val}"
       end
       
       if arr_terms and arr_terms.length > 0
-        sql += " WHERE #{self.makeWhere(arr_terms, driver)}"
+        sql << " WHERE #{self.makeWhere(arr_terms, driver)}"
       end
       
       driver.query(sql)
     end
   end
   
-  def select(tablename, arr_terms = nil, args = nil)
+  def select(tablename, arr_terms = nil, args = nil, &block)
     sql = ""
     
     conn_exec do |driver|
-      sql += "SELECT * FROM #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
+      sql = "SELECT * FROM #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
       
       if arr_terms != nil and !arr_terms.empty?
-        sql += " WHERE #{self.makeWhere(arr_terms, driver)}"
+        sql << " WHERE #{self.makeWhere(arr_terms, driver)}"
       end
       
       if args != nil
         if args["orderby"]
-          sql += " ORDER BY "
-          sql += args["orderby"]
+          sql << " ORDER BY "
+          sql << args["orderby"]
         end
         
         if args["limit"]
-          sql += " LIMIT " + args["limit"].to_s
+          sql << " LIMIT " + args["limit"].to_s
         end
         
         if args["limit_from"] and args["limit_to"]
           raise "'limit_from' was not numeric: '#{args["limit_from"]}'." if !Knj::Php.is_numeric(args["limit_from"])
           raise "'limit_to' was not numeric: '#{args["limit_to"]}'." if !Knj::Php.is_numeric(args["limit_to"])
           
-          sql += " LIMIT #{args["limit_from"]}, #{args["limit_to"]}"
+          sql << " LIMIT #{args["limit_from"]}, #{args["limit_to"]}"
         end
       end
-      
-      return driver.query(sql)
     end
     
-    raise "Something went wrong."
+    return self.q(sql, &block)
   end
   
   def selectsingle(tablename, arr_terms = nil, args = {})
@@ -273,13 +282,11 @@ class Knj::Db
   end
   
   def delete(tablename, arr_terms)
-    sql = ""
-    
     conn_exec do |driver|
-      sql += "DELETE FROM #{driver.escape_table}#{tablename.to_s}#{driver.escape_table}"
+      sql = "DELETE FROM #{driver.escape_table}#{tablename}#{driver.escape_table}"
       
-      if arr_terms != nil
-        sql += " WHERE #{self.makeWhere(arr_terms, driver)}"
+      if arr_terms != nil and !arr_terms.empty?
+        sql << " WHERE #{self.makeWhere(arr_terms, driver)}"
       end
       
       driver.query(sql)
@@ -294,15 +301,20 @@ class Knj::Db
       if first
         first = false
       else
-        sql += " AND "
+        sql << " AND "
       end
       
-      sql += "#{driver.escape_col}#{key.to_s}#{driver.escape_col} = #{driver.escape_val}#{driver.escape(value)}#{driver.escape_val}"
+      if value.is_a?(Array)
+        sql << "#{driver.escape_col}#{key}#{driver.escape_col} IN (#{Knj::ArrayExt.join(:arr => value, :sep => ",", :surr => "'", :callback => proc{|ele| self.esc(ele)})})"
+      else
+        sql << "#{driver.escape_col}#{key}#{driver.escape_col} = #{driver.escape_val}#{driver.escape(value)}#{driver.escape_val}"
+      end
     end
     
     return sql
   end
   
+  #Returns a driver-object based on the current thread and free driver-objects.
   def conn_exec
     if Thread.current[:knjdb]
       tid = self.__id__
@@ -341,34 +353,63 @@ class Knj::Db
     raise "Could not figure out how to find a driver to use?"
   end
   
+  #Executes a query and returns the result.
   def query(string)
-    conn_exec do |driver|
+    if @debug
+      begin
+        raise "test"
+      rescue => e
+        print "SQL: #{string}\n"
+        print e.backtrace.join("\n")
+        print "\n"
+      end
+    end
+    
+    self.conn_exec do |driver|
       return driver.query(string)
     end
   end
   
-  def q(str)
+  #Execute an ubuffered query and returns the result.
+  def query_ubuf(string, &block)
+    ret = nil
+    
+    self.conn_exec do |driver|
+      ret = driver.query_ubuf(string, &block)
+    end
+    
+    if block
+      ret.each(&block)
+      return nil
+    end
+    
+    return ret
+  end
+  
+  #Executes a query and returns the result. If a block is given the result is iterated over that block instead and it returns nil.
+  def q(str, &block)
     ret = self.query(str)
     
-    if block_given?
-      while data = ret.fetch
-        yield data
-      end
+    if block
+      ret.each(&block)
+      return nil
     end
     
     return ret
   end
   
+  #Returns the last inserted ID.
   def lastID
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       return driver.lastID
     end
   end
   
   alias :last_id :lastID
   
+  #Escapes a string to be safe-to-use in a query-string.
   def escape(string)
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       return driver.escape(string)
     end
   end
@@ -376,20 +417,20 @@ class Knj::Db
   alias :esc :escape
   
   def esc_col(str)
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       return driver.esc_col(str)
     end
   end
   
   def esc_table(str)
-    conn_exec do |driver|
+    self.conn_exec do |driver|
       return driver.esc_table(str)
     end
   end
   
   def enc_table
     if !@enc_table
-      conn_exec do |driver|
+      self.conn_exec do |driver|
         @enc_table = driver.escape_table
       end
     end
@@ -399,7 +440,7 @@ class Knj::Db
   
   def enc_col
     if !@enc_col
-      conn_exec do |driver|
+      self.conn_exec do |driver|
         @enc_col = driver.escape_col
       end
     end
@@ -415,6 +456,7 @@ class Knj::Db
     return Knj::Datet.in(date_obj)
   end
   
+  #Returns the table-module and spawns it if it isnt already spawned.
   def tables
     conn_exec do |driver|
       if !driver.tables
@@ -429,6 +471,7 @@ class Knj::Db
     end
   end
   
+  #Returns the columns-module and spawns it if it isnt already spawned.
   def cols
     if !@cols
       require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_columns" if (!@opts.key?(:require) or @opts[:require])
@@ -441,6 +484,7 @@ class Knj::Db
     return @cols
   end
   
+  #Returns the index-module and spawns it if it isnt already spawned.
   def indexes
     if !@indexes
       require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_indexes" if (!@opts.key?(:require) or @opts[:require])

data/lib/knj/knjdb/libknjdb_java_sqlite3.rb

@@ -1,83 +1,83 @@
 class KnjDB_java_sqlite3
-	def escape_table
-		return "`"
-	end
-	
-	def escape_col
-		return "`"
-	end
-	
-	def escape_val
-		return "'"
-	end
-	
-	def initialize(knjdb_ob)
-		@knjdb = knjdb_ob
-		
-		if @knjdb.opts[:sqlite_driver]
-			require @knjdb.opts[:sqlite_driver]
-		else
-			require File.dirname(__FILE__) + "/sqlitejdbc-v056.jar"
-		end
-		
-		require "java"
-		import "org.sqlite.JDBC"
-		@conn = java.sql.DriverManager::getConnection("jdbc:sqlite:" + @knjdb.opts[:path])
-		@stat = @conn.createStatement
-	end
-	
-	def query(string)
-		begin
-			return KnjDB_java_sqlite3_result.new(@stat.executeQuery(string))
-		rescue java.sql.SQLException => e
-			if e.message == "java.sql.SQLException: query does not return ResultSet"
-				#ignore it.
-			else
-				raise e
-			end
-		end
-	end
-	
-	def fetch(result)
-		return result.fetch
-	end
-	
-	def escape(string)
-		if (!string)
-			return ""
-		end
-		
-    	string = string.gsub("'", "\\'")
-		return string
-	end
-	
-	def lastID
-		return @conn.last_insert_row_id
-	end
+  def escape_table
+    return "`"
+  end
+  
+  def escape_col
+    return "`"
+  end
+  
+  def escape_val
+    return "'"
+  end
+  
+  def initialize(knjdb_ob)
+    @knjdb = knjdb_ob
+    
+    if @knjdb.opts[:sqlite_driver]
+      require @knjdb.opts[:sqlite_driver]
+    else
+      require File.dirname(__FILE__) + "/sqlitejdbc-v056.jar"
+    end
+    
+    require "java"
+    import "org.sqlite.JDBC"
+    @conn = java.sql.DriverManager::getConnection("jdbc:sqlite:" + @knjdb.opts[:path])
+    @stat = @conn.createStatement
+  end
+  
+  def query(string)
+    begin
+      return KnjDB_java_sqlite3_result.new(@stat.executeQuery(string))
+    rescue java.sql.SQLException => e
+      if e.message == "java.sql.SQLException: query does not return ResultSet"
+        #ignore it.
+      else
+        raise e
+      end
+    end
+  end
+  
+  def fetch(result)
+    return result.fetch
+  end
+  
+  def escape(string)
+    if (!string)
+      return ""
+    end
+    
+      string = string.gsub("'", "\\'")
+    return string
+  end
+  
+  def lastID
+    return @conn.last_insert_row_id
+  end
 end
 
 class KnjDB_java_sqlite3_result
-	def initialize(rs)
-		@rs = rs
-		@index = 0
-		
-		if rs
-			@metadata = rs.getMetaData
-			@columns_count = @metadata.getColumnCount
-		end
-	end
-	
-	def fetch
-		if !@rs.next
-			return false
-		end
-		
-		tha_return = {}
-		for i in (1..@columns_count)
-			col_name = @metadata.getColumnName(i)
-			tha_return.store(col_name, @rs.getString(i))
-		end
-		
-		return tha_return
-	end
+  def initialize(rs)
+    @rs = rs
+    @index = 0
+    
+    if rs
+      @metadata = rs.getMetaData
+      @columns_count = @metadata.getColumnCount
+    end
+  end
+  
+  def fetch
+    if !@rs.next
+      return false
+    end
+    
+    tha_return = {}
+    for i in (1..@columns_count)
+      col_name = @metadata.getColumnName(i)
+      tha_return.store(col_name, @rs.getString(i))
+    end
+    
+    return tha_return
+  end
 end