knjrbfw 0.0.7 → 0.0.8

data/lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb

@@ -207,8 +207,8 @@ class KnjDB_mysql::Tables::Table
 	
 	def create_indexes(index_arr)
 		index_arr.each do |index_data|
-			raise "No name was given." if !index_data.has_key?("name") or index_data["name"].strip.length <= 0
-			raise "No columns was given on index #{index_data["name"]}." if index_data["columns"].empty?
+			raise "No name was given." if !index_data.key?("name") or index_data["name"].strip.length <= 0
+			raise "No columns was given on index: '#{index_data["name"]}'." if !index_data["columns"] or index_data["columns"].empty?
 			
 			sql = "CREATE INDEX #{@db.escape_col}#{@db.esc_col(index_data["name"])}#{@db.escape_col} ON #{@db.escape_table}#{@db.esc_table(self.name)}#{@db.escape_table} ("
 			

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3.rb

@@ -12,11 +12,23 @@ class KnjDB_sqlite3
     @knjdb = knjdb_ob
     @path = @knjdb.opts[:path] if @knjdb.opts[:path]
     @path = @knjdb.opts["path"] if @knjdb.opts["path"]
-    @symbolize = true if !@knjdb.opts.has_key?(:return_keys) or @knjdb.opts[:return_keys] == "symbols"
+    @symbolize = true if !@knjdb.opts.key?(:return_keys) or @knjdb.opts[:return_keys] == "symbols"
     
+    @knjdb.opts[:subtype] = "java" if !@knjdb.opts.key?(:subtype) and RUBY_ENGINE == "jruby"
     raise "No path was given." if !@path
     
-    if @knjdb.opts[:subtype] == "rhodes"
+    if @knjdb.opts[:subtype] == "java"
+      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
+    elsif @knjdb.opts[:subtype] == "rhodes"
       @conn = SQLite3::Database.new(@path, @path)
     else
       @conn = SQLite3::Database.open(@path)
@@ -28,16 +40,24 @@ class KnjDB_sqlite3
   def query(string)
     begin
       if @knjdb.opts[:subtype] == "rhodes"
-        res = @conn.execute(string, string)
+        return KnjDB_sqlite3_result.new(self, @conn.execute(string, string))
+      elsif @knjdb.opts[:subtype] == "java"
+        begin
+          return KnjDB_sqlite3_result_java.new(self, @stat.executeQuery(string))
+        rescue java.sql.SQLException => e
+          if e.message == "java.sql.SQLException: query does not return ResultSet"
+            return KnjDB_sqlite3_result_java.new(self, nil)
+          else
+            raise e
+          end
+        end
       else
-        res = @conn.execute(string)
+        return KnjDB_sqlite3_result.new(self, @conn.execute(string))
       end
-    rescue Exception => e
-      print "SQL: #{string}\n"
-      raise e
+    rescue => e
+      #Add SQL to the error message.
+      raise e.class, "#{e.message}\n\nSQL: #{string}"
     end
-    
-    return KnjDB_sqlite3_result.new(self, res)
   end
   
   def escape(string)
@@ -65,23 +85,60 @@ class KnjDB_sqlite3
   end
 end
 
+class KnjDB_sqlite3_result_java
+  def initialize(driver, rs)
+    @index = 0
+    retkeys = driver.knjdb.opts[:return_keys]
+    
+    if rs
+      metadata = rs.getMetaData
+      columns_count = metadata.getColumnCount
+      
+      @rows = []
+      while rs.next
+        row_data = {}
+        for i in (1..columns_count)
+          col_name = metadata.getColumnName(i)
+          col_name = col_name.to_s.to_sym if retkeys == "symbols"
+          row_data[col_name] = rs.getString(i)
+        end
+        
+        @rows << row_data
+      end
+    end
+  end
+  
+  def fetch
+    return false if !@rows
+    ret = @rows[@index]
+    return false if !ret
+    @index += 1
+    return ret
+  end
+end
+
 class KnjDB_sqlite3_result
   def initialize(driver, result_array)
     @result_array = result_array
     @index = 0
-    @retkeys = driver.knjdb.opts[:return_keys]
+    
+    if driver.knjdb.opts[:return_keys] == "symbols"
+      @symbols = true
+    else
+      @symbols = false
+    end
   end
   
   def fetch
-    tha_return = @result_array[@index]
-    return false if !tha_return
+    result_hash = @result_array[@index]
+    return false if !result_hash
     @index += 1
     
     ret = {}
-    tha_return.each do |key, val|
+    result_hash.each do |key, val|
       if Knj::Php::is_numeric(key)
         #do nothing.
-      elsif @retkeys == "symbols" and !key.is_a?(Symbol)
+      elsif @symbols and !key.is_a?(Symbol)
         ret[key.to_sym] = val
       else
         ret[key] = val

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_columns.rb

@@ -11,23 +11,26 @@ class KnjDB_sqlite3::Columns
 		raise "No type given." if !data["type"]
 		type = data["type"]
 		
-		data["maxlength"] = 255 if type == "varchar" and !data.has_key?("maxlength")
+		if type == "enum"
+      type = "varchar"
+      data.delete("maxlength")
+    end
+		
+		data["maxlength"] = 255 if type == "varchar" and !data.key?("maxlength")
 		type = "integer" if @db.int_types.index(type) and (data["autoincr"] or data["primarykey"])
 		
 		sql = "`#{data["name"]}` #{type}"
 		sql += "(#{data["maxlength"]})" if data["maxlength"] and !data["autoincr"]
-		sql += "(11)" if !data.has_key?("maxlength") and !data["autoincr"]
+		sql += "(11)" if !data.key?("maxlength") and !data["autoincr"]
 		sql += " PRIMARY KEY" if data["primarykey"]
-		sql += " NOT NULL" if !data["null"] and data.has_key?("null")
+		sql += " NOT NULL" if !data["null"] and data.key?("null")
 		
-		if data.has_key?("default_func")
+		if data.key?("default_func")
 			sql += " DEFAULT #{data["default_func"]}"
-		elsif data.has_key?("default") and data["default"] != false
-			sql += " DEFAULT '#{@driver.escape(data["default"])}'"
+		elsif data.key?("default") and data["default"] != false
+			sql += " DEFAULT '#{@db.escape(data["default"])}'"
 		end
 		
-		sql += " COMMENT '#{@driver.escape(data["comment"])}'" if data.has_key?("comment")
-		
 		return sql
 	end
 end
@@ -132,12 +135,12 @@ class KnjDB_sqlite3::Columns::Column
 	def change(data)
 		newdata = data.clone
 		
-		newdata["name"] = self.name if !newdata.has_key?("name")
-		newdata["type"] = self.type if !newdata.has_key?("type")
-		newdata["maxlength"] = self.maxlength if !newdata.has_key?("maxlength") and self.maxlength
-		newdata["null"] = self.null? if !newdata.has_key?("null")
-		newdata["default"] = self.default if !newdata.has_key?("default")
-		newdata.delete("primarykey") if newdata.has_key?("primarykey")
+		newdata["name"] = self.name if !newdata.key?("name")
+		newdata["type"] = self.type if !newdata.key?("type")
+		newdata["maxlength"] = self.maxlength if !newdata.key?("maxlength") and self.maxlength
+		newdata["null"] = self.null? if !newdata.key?("null")
+		newdata["default"] = self.default if !newdata.key?("default")
+		newdata.delete("primarykey") if newdata.key?("primarykey")
 		
 		@type = nil
 		@maxlength = nil

data/lib/knj/knjdb/drivers/sqlite3/knjdb_sqlite3_tables.rb

@@ -80,7 +80,7 @@ class KnjDB_sqlite3::Tables::Table
 			@db.cols
 			@list = {}
 			
-			q_cols = @db.query("PRAGMA table_info(#{self.name})")
+			q_cols = @db.query("PRAGMA table_info(`#{@driver.esc_table(self.name)}`)")
 			while d_cols = q_cols.fetch
 				@list[d_cols[:name]] = KnjDB_sqlite3::Columns::Column.new(
 					:table => self,
@@ -96,7 +96,7 @@ class KnjDB_sqlite3::Tables::Table
 	
 	def create_columns(col_arr)
 		col_arr.each do |col_data|
-			#if col_data.has_key?("after")
+			#if col_data.key?("after")
 			#	self.create_column_programmatic(col_data)
 			#else
 				@db.query("ALTER TABLE `#{self.name}` ADD COLUMN #{@db.cols.data_sql(col_data)};")
@@ -175,7 +175,7 @@ class KnjDB_sqlite3::Tables::Table
 			sql += ", " if !first
 			first = false if first
 			
-			if args.has_key?("alter_columns") and args["alter_columns"][name.to_s]
+			if args.key?("alter_columns") and args["alter_columns"][name.to_s]
 				sql += @db.cols.data_sql(args["alter_columns"][name.to_s])
 			else
 				sql += @db.cols.data_sql(col.data)
@@ -227,7 +227,7 @@ class KnjDB_sqlite3::Tables::Table
 			@db.indexes
 			@indexes_list = {}
 			
-			q_indexes = @db.query("PRAGMA index_list(`#{self.name}`)")
+			q_indexes = @db.query("PRAGMA index_list(`#{@driver.esc_table(self.name)}`)")
 			while d_indexes = q_indexes.fetch
         if @db.opts[:index_append_table_name]
           match_name = d_indexes[:name].match(/__(.+)$/)
@@ -257,7 +257,7 @@ class KnjDB_sqlite3::Tables::Table
 	
 	def create_indexes(index_arr)
 		index_arr.each do |index_data|
-			raise "No name was given." if !index_data.has_key?("name") or index_data["name"].strip.length <= 0
+			raise "No name was given." if !index_data.key?("name") or index_data["name"].strip.length <= 0
 			raise "No columns was given on index #{index_data["name"]}." if index_data["columns"].empty?
 			
 			name = index_data["name"]

data/lib/knj/knjdb/libknjdb.rb

@@ -26,12 +26,10 @@ class Knj::Db
       @opts[key.to_sym] = val
     end
     
-    if @opts[:type] == "sqlite3" and RUBY_PLATFORM == "java"
-      @opts[:type] = "java_sqlite3"
-    elsif @opts[:type] == "mysql" and RUBY_PLATFORM == "java"
+    if RUBY_PLATFORM == "java"
       @opts[:subtype] = "java"
     elsif @opts[:type] == "sqlite3" and RUBY_PLATFORM.index("mswin32") != nil
-      @opts[:type] = "sqlite3_ironruby"
+      @opts[:subtype] = "ironruby"
     end
     
     self.connect
@@ -67,7 +65,7 @@ class Knj::Db
     fpaths.each do |fpath|
       rpath = "#{File.dirname(__FILE__)}/#{fpath}"
       
-      if (!@opts.has_key?(:require) or @opts[:require]) and File.exists?(rpath)
+      if (!@opts.key?(:require) or @opts[:require]) and File.exists?(rpath)
         require rpath
         break
       end
@@ -88,7 +86,7 @@ class Knj::Db
   def free_thread
     tid = self.__id__
     
-    if Thread.current[:knjdb] and Thread.current[:knjdb].has_key?(tid)
+    if Thread.current[:knjdb] and Thread.current[:knjdb].key?(tid)
       db = Thread.current[:knjdb][tid]
       Thread.current[:knjdb].delete(tid)
       @conns.free(db) if @conns
@@ -112,7 +110,7 @@ class Knj::Db
       table_args = nil
       table_args = args["tables"][table["name"].to_s] if args and args["tables"] and args["tables"][table["name"].to_s]
       next if table_args and table_args["skip"]
-      table.delete("indexes") if table.has_key?("indexes") and args["skip_indexes"]
+      table.delete("indexes") if table.key?("indexes") and args["skip_indexes"]
       db.tables.create(table["name"], table)
       
       limit_from = 0
@@ -309,7 +307,7 @@ class Knj::Db
     if Thread.current[:knjdb]
       tid = self.__id__
       
-      if Thread.current[:knjdb].has_key?(tid)
+      if Thread.current[:knjdb].key?(tid)
         yield(Thread.current[:knjdb][tid])
         return nil
       end
@@ -325,9 +323,18 @@ class Knj::Db
         @conns.free(conn)
       end
     elsif @conn
-      @mutex.synchronize do
-        yield(@conn)
-        return nil
+      begin
+        @mutex.synchronize do
+          yield(@conn)
+          return nil
+        end
+      rescue ThreadError => e
+        if e.message != "deadlock; recursive locking"
+          yield(@conn)
+          return nil
+        else
+          raise e
+        end
       end
     end
     
@@ -390,8 +397,18 @@ class Knj::Db
     return @enc_table
   end
   
-  def date_out(date_obj)
-    return Knj::Datet.in(date_obj).dbstr
+  def enc_col
+    if !@enc_col
+      conn_exec do |driver|
+        @enc_col = driver.escape_col
+      end
+    end
+    
+    return @enc_col
+  end
+  
+  def date_out(date_obj = Knj::Datet.new, args = {})
+    return Knj::Datet.in(date_obj).dbstr(args)
   end
   
   def date_in(date_obj)
@@ -401,7 +418,7 @@ class Knj::Db
   def tables
     conn_exec do |driver|
       if !driver.tables
-        require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_tables" if (!@opts.has_key?(:require) or @opts[:require])
+        require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_tables" if (!@opts.key?(:require) or @opts[:require])
         driver.tables = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Tables).new(
           :driver => driver,
           :db => self
@@ -414,7 +431,7 @@ class Knj::Db
   
   def cols
     if !@cols
-      require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_columns" if (!@opts.has_key?(:require) or @opts[:require])
+      require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_columns" if (!@opts.key?(:require) or @opts[:require])
       @cols = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Columns).new(
         :driver => @conn,
         :db => self
@@ -426,7 +443,7 @@ class Knj::Db
   
   def indexes
     if !@indexes
-      require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_indexes" if (!@opts.has_key?(:require) or @opts[:require])
+      require "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}/knjdb_#{@opts[:type]}_indexes" if (!@opts.key?(:require) or @opts[:require])
       @indexes = Kernel.const_get("KnjDB_#{@opts[:type]}".to_sym).const_get(:Indexes).new(
         :driver => @conn,
         :db => self

data/lib/knj/knjdb/libknjdb_row.rb

@@ -43,7 +43,7 @@ class Knj::Db_row
 	end
 	
 	def ob
-		return @args[:objects] if @args.has_key?(:objects)
+		return @args[:objects] if @args.key?(:objects)
 		return $ob if $ob and $ob.is_a?(Knj::Objects)
 		return false
 	end
@@ -83,18 +83,18 @@ class Knj::Db_row
 	end
 	
 	def has_key?(key)
-		return @data.has_key?(key.to_sym)
+		return @data.key?(key.to_sym)
 	end
 	
 	def [](key)
 		raise "No valid key given." if !key
 		raise "No data was loaded on the object? Maybe you are trying to call a deleted object?" if !@data
 		
-		if @data.has_key?(key)
+		if @data.key?(key)
 			return @data[key]
-		elsif @data.has_key?(key.to_sym)
+		elsif @data.key?(key.to_sym)
 			return @data[key.to_sym]
-		elsif @data.has_key?(key.to_s)
+		elsif @data.key?(key.to_s)
 			return @data[key.to_s]
 		end
 		
@@ -115,9 +115,9 @@ class Knj::Db_row
 			return @data[@args[:col_title].to_sym]
 		end
 		
-		if @data.has_key?(:title)
+		if @data.key?(:title)
 			return @data[:title]
-		elsif @data.has_key?(:name)
+		elsif @data.key?(:name)
 			return @data[:name]
 		end
 		
@@ -136,7 +136,7 @@ class Knj::Db_row
 	
 	def method_missing(*args)
 		func_name = args[0].to_s
-		if match = func_name.match(/^(\S+)\?$/) and @data.has_key?(match[1].to_sym)
+		if match = func_name.match(/^(\S+)\?$/) and @data.key?(match[1].to_sym)
 			if @data[match[1].to_sym] == "1" or @data[match[1].to_sym] == "yes"
 				return true
 			elsif @data[match[1].to_sym] == "0" or @data[match[1].to_sym] == "no"

data/lib/knj/maemo/fremantle-calendar/fremantle-calendar.rb

@@ -37,7 +37,7 @@ class Knj
 				end
 				
 				def [](key)
-					if (!@data.has_key?(key))
+					if (!@data.key?(key))
 						raise "No such key: '" + key + "'"
 					end
 					

data/lib/knj/mount.rb

@@ -13,8 +13,8 @@ class Knj::Mount
 			#raise "The folder doesnt exist?" if !File.exists?(folder_to)
 			
 			add = true
-			add = false if args.has_key?("to") and args["to"] != folder_to
-			add = false if args.has_key?("from") and args["from"] != folder_from
+			add = false if args.key?("to") and args["to"] != folder_to
+			add = false if args.key?("from") and args["from"] != folder_from
 			
 			if args["from_search"]
 				Knj::Strings.searchstring(args["from_search"]).each do |str|
@@ -43,11 +43,11 @@ class Knj::Mount
 	
 	def self.mount(args)
 		cmd = "mount"
-		cmd += " -t #{Knj::Strings.unixsafe(args["type"])}" if args.has_key?("type")
+		cmd += " -t #{Knj::Strings.unixsafe(args["type"])}" if args.key?("type")
 		cmd += " --bind" if args["bind"]
 		cmd += " #{Knj::Strings.unixsafe(args["from"])} #{Knj::Strings.unixsafe(args["to"])}"
 		
-		if args.has_key?("opts")
+		if args.key?("opts")
 			raise "opts argument must be an array." if !args["opts"].is_a?(Array)
 			
 			cmd += "-O "
@@ -85,7 +85,7 @@ class Knj::Mount
 	end
 	
 	def [](key)
-		raise "Invalid key: #{key}." if !@data.has_key?(key)
+		raise "Invalid key: #{key}." if !@data.key?(key)
 		return @data[key]
 	end
 	
@@ -96,7 +96,7 @@ class Knj::Mount
 	alias :umount :unmount
 	
 	def access?(args = {})
-		args["timeout"] = 2 if !args.has_key?("timeout")
+		args["timeout"] = 2 if !args.key?("timeout")
 		access = false
 		
 		begin