knjrbfw 0.0.21 → 0.0.22

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

@@ -5,7 +5,6 @@ class KnjDB_mysql
   def initialize(knjdb_ob)
     @knjdb = knjdb_ob
     @opts = @knjdb.opts
-    @encoding = @opts[:encoding]
     @escape_table = "`"
     @escape_col = "`"
     @escape_val = "'"
@@ -13,6 +12,12 @@ class KnjDB_mysql
     @esc_col = "`"
     @mutex = Mutex.new
     
+    if @opts[:encoding]
+      @encoding = @opts[:encoding]
+    else
+      @encoding = "utf8"
+    end
+    
     if @knjdb.opts.key?(:port)
       @port = @knjdb.opts[:port].to_i
     else
@@ -88,8 +93,8 @@ class KnjDB_mysql
           @jdbc_loaded = true
         end
         
-        @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@knjdb.opts[:host]}:#{@port}/#{@knjdb.opts[:db]}?user=#{@knjdb.opts[:user]}&password=#{@knjdb.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round")
-        query("SET SQL_MODE = ''")
+        @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@knjdb.opts[:host]}:#{@port}/#{@knjdb.opts[:db]}?user=#{@knjdb.opts[:user]}&password=#{@knjdb.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}")
+        self.query("SET SQL_MODE = ''")
       else
         raise "Unknown subtype: #{@subtype}"
     end
@@ -495,12 +500,12 @@ class KnjDB_java_mysql_result
     if @as_hash
       ret = {}
       1.upto(@keys.length) do |count|
-        ret[@keys[count - 1]] = @result.string(count).to_s.encode("utf-8")
+        ret[@keys[count - 1]] = @result.string(count)
       end
     else
       ret = []
       1.upto(@count) do |count|
-        ret << @result.string(count).to_s.encode("utf-8")
+        ret << @result.string(count)
       end
     end
     

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

@@ -112,7 +112,7 @@ class KnjDB_mysql::Columns::Column
   end
   
   def drop
-    @args[:db].query("ALTER TABLE `#{@args[:table].name}` DROP COLUMN `#{self.name}`")
+    @args[:db].query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
   end
   
   def change(data)

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

@@ -22,7 +22,17 @@ class KnjDB_mysql::Indexes::Index
   
   def drop
     sql = "DROP INDEX `#{self.name}` ON `#{self.table.name}`"
-    @args[:db].query(sql)
+    
+    begin
+      @args[:db].query(sql)
+    rescue => e
+      #The index has already been dropped - ignore.
+      if e.message.index("check that column/key exists") != nil
+        #ignore.
+      else
+        raise e
+      end
+    end
   end
   
   def data

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

@@ -2,7 +2,6 @@ require "#{$knjpath}wref"
 
 class KnjDB_mysql::Tables
   attr_reader :db, :driver, :list
-  attr_accessor :list_should_be_reloaded
   
   def initialize(args)
     @args = args
@@ -83,7 +82,6 @@ class KnjDB_mysql::Tables
     sql << ")"
     
     @db.query(sql)
-    @list_should_be_reloaded = true
     
     if data["indexes"]
       table_obj = self[name]

data/lib/knj/knjdb/libknjdb.rb

@@ -400,8 +400,48 @@ class Knj::Db
     return ret
   end
   
+  #Clones the connection, executes a unbuffered query and closes the connection again.
+  def cloned_conn(args = nil, &block)
+    subtype = @opts[:subtype]
+    
+    #MySQL2-driver doesnt support unbuffered queries yet.
+    if @opts[:type] == "mysql" and @opts[:subtype] == "mysql2"
+      subtype = "mysql"
+    end
+    
+    clone_conn_args = {
+      :subtype => subtype,
+      :threadsafe => false
+    }
+    
+    clone_conn_args.merge!(args[:clone_args]) if args and args[:clone_args]
+    dbconn = self.clone_conn(clone_conn_args)
+    
+    begin
+      yield(dbconn)
+    ensure
+      dbconn.close
+    end
+  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)
+  def q(str, args = nil, &block)
+    #If the query should be executed in a new connection unbuffered.
+    if args
+      if args[:cloned_ubuf]
+        raise "No block given." if !block
+        
+        self.cloned_conn(:clone_args => args[:clone_args]) do |cloned_conn|
+          ret = cloned_conn.query_ubuf(str)
+          ret.each(&block)
+        end
+        
+        return nil
+      else
+        raise "Invalid arguments given: '#{args}'."
+      end
+    end
+    
     ret = self.query(str)
     
     if block

data/lib/knj/knjdb/revision.rb

@@ -40,7 +40,7 @@ class Knj::Db::Revision
     @db = db
     
     #Check for normal bugs and raise apropiate error.
-    raise "'schema' argument was not a Hash." if !schema.is_a?(Hash)
+    raise "'schema' argument was not a Hash: '#{schema.class.name}'." if !schema.is_a?(Hash)
     raise "':return_keys' is not 'symbols' - Knjdbrevision will not work without it." if db.opts[:return_keys] != "symbols"
     raise "No tables given." if !schema.has_key?("tables")
     
@@ -137,6 +137,8 @@ class Knj::Db::Revision
                 print "Column not found: #{table_obj.name}.#{col_data["name"]}.\n" if args["debug"]
                 
                 if col_data.has_key?("renames")
+                  raise "'renames' was not an array for column '#{table_obj.name}.#{col_data["name"]}'." if !col_data["renames"].is_a?(Array)
+                  
                   rename_found = false
                   col_data["renames"].each do |col_name|
                     begin
@@ -236,6 +238,11 @@ class Knj::Db::Revision
             end
           end
           
+          if !table_data.key?("columns")
+            print "Notice: Skipping creation of '#{table_name}' because no columns were given in hash.\n"
+            next
+          end
+          
           if table_data["on_create"]
             table_data["on_create"].call("db" => db, "table_name" => table_name, "table_data" => table_data)
           end
@@ -258,7 +265,7 @@ class Knj::Db::Revision
       schema["tables_remove"].each do |table_name, table_data|
         begin
           table_obj = db.tables[table_name.to_sym]
-          table_data["callback"].call if table_data.is_a?(Hash) and table_data["callback"]
+          table_data["callback"].call("db" => db, "table" => table_obj) if table_data.is_a?(Hash) and table_data["callback"]
           table_obj.drop
         rescue Knj::Errors::NotFound => e
           next

data/lib/knj/locales.rb

@@ -1,4 +1,5 @@
 module Knj::Locales
+  #Returns the primary locale, secondary locale and the two put together.
   def self.lang
     match = self.locale.to_s.match(/^([a-z]{2})_([A-Z]{2})/)
     raise "Could not understand language: #{self.locale}." if !match
@@ -6,10 +7,11 @@ module Knj::Locales
     return {
       "first" => match[1],
       "second" => match[2],
-      "full" => match[1] + "_" + match[2]
+      "full" => "#{match[1]}_#{match[2]}"
     }
   end
   
+  #Returns various localized information about the environment.
   def self.localeconv
     f = Knj::Locales.lang["first"]
     
@@ -35,28 +37,33 @@ module Knj::Locales
     }
   end
   
+  #Returns a float from the formatted string according to the current locale.
   def self.number_in(num_str)
     lc = Knj::Locales.localeconv
     num_str = num_str.to_s.gsub(lc["thousands_sep"], "").gsub(lc["decimal_point"], ".").to_f
     return num_str
   end
   
+  #Returns the given number as a formatted string according to the current locale.
   def self.number_out(num_str, dec = 2)
     lc = Knj::Locales.localeconv
     return Knj::Php.number_format(num_str, dec, lc["decimal_point"], lc["thousands_sep"])
   end
   
+  #Returns the current locale for the current environment.
   def self.locale
     begin
-      return _session[:locale]
+      return _session[:locale] if _session[:locale].to_s.strip.length > 0
     rescue NameError
-      if Thread.current[:locale]
-        return Thread.current[:locale]
-      elsif $locale
-        return $locale
-      elsif ENV["LANGUAGE"]
-        return ENV["LANGUAGE"]
-      end
+      #ignore.
+    end
+    
+    if Thread.current[:locale]
+      return Thread.current[:locale]
+    elsif $locale
+      return $locale
+    elsif ENV["LANGUAGE"]
+      return ENV["LANGUAGE"]
     end
     
     raise "Could not figure out locale."

data/lib/knj/objects.rb

@@ -13,10 +13,13 @@ class Knj::Objects
     @args[:module] = Kernel if !@args[:module]
     @args[:cache] = :weak if !@args.key?(:cache)
     @objects = {}
+    @locks = {}
     @data = {}
     @mutex_require = Mutex.new
     
-    require "weakref" if @args[:cache] == :weak and !Kernel.const_defined?(:WeakRef)
+    if @args[:cache] == :weak
+      require "#{$knjpath}wref"
+    end
     
     @events = Knj::Event_handler.new
     @events.add_event(
@@ -57,8 +60,16 @@ class Knj::Objects
   end
   
   def init_class(classname)
+    classname = classname.to_sym
     return false if @objects.key?(classname)
-    @objects[classname] = {}
+    
+    if @args[:cache] == :weak
+      @objects[classname] = Knj::Wref_map.new
+    else
+      @objects[classname] = {}
+    end
+    
+    @locks[classname] = Mutex.new
   end
   
   #Returns a cloned version of the @objects variable. Cloned because iteration on it may crash some of the other methods in Ruby 1.9+
@@ -72,10 +83,12 @@ class Knj::Objects
     return objs_cloned
   end
   
+  #Returns the database-connection used by this instance of Objects.
   def db
     return @args[:db]
   end
   
+  #Returns the total count of objects currently held by this instance.
   def count_objects
     count = 0
     @objects.keys.each do |key|
@@ -85,6 +98,7 @@ class Knj::Objects
     return count
   end
   
+  #This connects a block to an event. When the event is called the block will be executed.
   def connect(args, &block)
     raise "No object given." if !args["object"]
     raise "No signals given." if !args.key?("signal") and !args.key?("signals")
@@ -94,8 +108,9 @@ class Knj::Objects
     @callbacks[args["object"]][conn_id] = args
   end
   
+  #This method is used to call the connected callbacks for an event.
   def call(args, &block)
-    classstr = args["object"].class.to_s
+    classstr = args["object"].class.to_s.split("::").last
     
     if @callbacks.key?(classstr)
       @callbacks[classstr].clone.each do |callback_key, callback|
@@ -132,10 +147,12 @@ class Knj::Objects
   
   def requireclass(classname, args = {})
     classname = classname.to_sym
-    
     return false if @objects.key?(classname)
     
     @mutex_require.synchronize do
+      #Maybe the classname got required meanwhile the synchronized wait - check again.
+      return false if @objects.key?(classname)
+      
       if (@args[:require] or !@args.key?(:require)) and (!args.key?(:require) or args[:require])
         filename = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}.rb"
         filename_req = "#{@args[:class_path]}/#{@args[:class_pre]}#{classname.to_s.downcase}"
@@ -164,7 +181,7 @@ class Knj::Objects
         self.load_class(classname, args)
       end
       
-      @objects[classname] = {}
+      self.init_class(classname)
     end
   end
   
@@ -195,48 +212,44 @@ class Knj::Objects
       raise Knj::Errors::InvalidData, "Unknown data: '#{data.class.to_s}'."
     end
     
-    if @objects.key?(classname) and @objects[classname].key?(id)
+    if @objects.key?(classname)
       case @args[:cache]
         when :weak
-          begin
-            obj = @objects[classname][id].__getobj__
-            
-            if obj.is_a?(Knj::Datarow) and obj.respond_to?(:table) and obj.respond_to?(:id) and obj.table.to_sym == classname and obj.id.to_i == id
-              return obj
-            else
-              #This actually happens sometimes... WTF!? - knj
-              raise WeakRef::RefError
-            end
-          rescue WeakRef::RefError
-            @objects[classname].delete(id)
-          rescue NoMethodError => e
-            #NoMethodError because the object might have been deleted from the cache, and __getobj__ then throws it.
-            raise e if e.message != "undefined method `__getobj__' for nil:NilClass"
+          if obj = @objects[classname].get!(id) and obj.id.to_i == id
+            return obj
           end
         else
-          return @objects[classname][id]
+          return @objects[classname][id] if @objects[classname].key?(id)
       end
     end
     
     self.requireclass(classname) if !@objects.key?(classname)
     
-    if @args[:datarow] or @args[:custom]
-      obj = @args[:module].const_get(classname).new(Knj::Hash_methods.new(:ob => self, :data => data))
-    else
-      args = [data]
-      args = args | @args[:extra_args] if @args[:extra_args]
-      obj = @args[:module].const_get(classname).new(*args)
-    end
-    
-    case @args[:cache]
-      when :weak
-        @objects[classname][id] = WeakRef.new(obj)
-      when :none
+    @locks[classname].synchronize do
+      #Maybe the object got spawned while we waited for the lock? If so we shouldnt spawn another instance.
+      if obj = @objects[classname].get!(id) and obj.id.to_i == id
         return obj
+      end
+      
+      #Spawn object.
+      if @args[:datarow] or @args[:custom]
+        obj = @args[:module].const_get(classname).new(Knj::Hash_methods.new(:ob => self, :data => data))
       else
-        @objects[classname][id] = obj
+        args = [data]
+        args = args | @args[:extra_args] if @args[:extra_args]
+        obj = @args[:module].const_get(classname).new(*args)
+      end
+      
+      #Save object in cache.
+      case @args[:cache]
+        when :none
+          return obj
+        else
+          @objects[classname][id] = obj
+      end
     end
     
+    #Return spawned object.
     return obj
   end
   
@@ -386,10 +399,8 @@ class Knj::Objects
     end
     
     if RUBY_VERSION[0..2] == 1.8 and Knj::Php.class_exists("Dictionary")
-      print "Spawning dictionary.\n" if args[:debug]
       list = Dictionary.new
     else
-      print "Spawning normal hash.\n" if args[:debug]
       list = {}
     end
     
@@ -403,10 +414,7 @@ class Knj::Objects
       list["0"] = _("None")
     end
     
-    print "Doing loop\n" if args[:debug]
     self.list(classname, args[:list_args]) do |object|
-      print "Object: #{object.id}\n" if args[:debug]
-      
       if object.respond_to?(:name)
         list[object.id] = object.name
       elsif object.respond_to?(:title)
@@ -416,15 +424,27 @@ class Knj::Objects
       end
     end
     
-    print "Returning...\n" if args[:debug]
     return list
   end
   
   #Returns a list of a specific object by running specific SQL against the database.
-  def list_bysql(classname, sql, d = nil, &block)
+  def list_bysql(classname, sql, args = nil, &block)
     classname = classname.to_sym
     ret = [] if !block
-    @args[:db].q(sql) do |d_obs|
+    qargs = nil
+    
+    if args
+      args.each do |key, val|
+        case key
+          when :cloned_ubuf
+            qargs = {:cloned_ubuf => true}
+          else
+            raise "Invalid key: '#{key}'."
+        end
+      end
+    end
+    
+    @args[:db].q(sql, qargs) do |d_obs|
       if block
         block.call(self.get(classname, d_obs))
       else
@@ -432,10 +452,14 @@ class Knj::Objects
       end
     end
     
-    return ret if !block
+    if !block
+      return ret
+    else
+      return nil
+    end
   end
   
-  # Add a new object to the database and to the cache.
+  #Add a new object to the database and to the cache.
   def add(classname, data = {})
     classname = classname.to_sym
     self.requireclass(classname)
@@ -577,7 +601,7 @@ class Knj::Objects
     classname = classname.to_sym
     
     return false if !@objects.key?(classname)
-    @objects[classname] = {}
+    @objects.delete(classname)
   end
   
   #Delete an object. Both from the database and from the cache.
@@ -588,13 +612,22 @@ class Knj::Objects
     object.delete if object.respond_to?(:delete)
     
     if @args[:datarow]
+      #If autodelete is set by 'has_many'-method, go through it and delete the various objects first.
+      object.class.autodelete_data.each do |adel_data|
+        self.list(adel_data[:classname], {adel_data[:colname].to_s => object.id}) do |obj_del|
+          self.delete(obj_del)
+        end
+      end
+      
+      #If depend is set by 'has_many'-method, check if any objects exists and raise error if so.
       object.class.depending_data.each do |dep_data|
-        objs = self.list(dep_data[:classname], {dep_data[:colname].to_s => object.id, "limit" => 1})
-        if !objs.empty?
-          raise "Cannot delete <#{object.class.name}:#{object.id}> because <#{objs[0].class.name}:#{objs[0].id}> depends on it."
+        obj = self.get_by(dep_data[:classname], {dep_data[:colname].to_s => object.id})
+        if obj
+          raise "Cannot delete <#{object.class.name}:#{object.id}> because <#{obj.class.name}:#{obj.id}> depends on it."
         end
       end
       
+      #Delete any translations that has been set on the object by 'has_translation'-method.
       if object.class.translations
         _kas.trans_del(object)
       end
@@ -668,18 +701,7 @@ class Knj::Objects
   #Runs through all objects-weaklink-references and removes the weaklinks if the object has been recycled.
   def clean_all_weak
     @objects.keys.each do |classn|
-      @objects[classn].keys.each do |object_id|
-        object = @objects[classn][object_id]
-        
-        begin
-          if !object or !object.weakref_alive?
-            @objects[classn].delete(object_id)
-          end
-        rescue WeakRef::RefError
-          #This happens if the object has been collected.
-          @objects[classn].delete(object_id)
-        end
-      end
+      @objects[classn].clean
     end
   end
   
@@ -707,4 +729,4 @@ class Knj::Objects
   end
 end
 
-require "#{$knjpath}objects/objects_sqlhelper"
+require "#{$knjpath}objects/objects_sqlhelper"