baza 0.0.14 → 0.0.15

data/include/drivers/mysql/mysql_column.rb

@@ -0,0 +1,133 @@
+#This class handels every MySQL-column, that can be returned from a table-object.
+class Baza::Driver::Mysql::Column
+  attr_reader :args, :name
+
+  #Constructor. Should not be called manually.
+  def initialize(args)
+    @args = args
+    @name = @args[:data][:Field].to_sym
+    @db = @args[:db]
+  end
+
+  #Used to validate in Knj::Wrap_map.
+  def __object_unique_id__
+    return @name
+  end
+
+  def table_name
+    @args[:table_name]
+  end
+
+  #Returns the table-object that this column belongs to.
+  def table
+    return @db.tables[table_name]
+  end
+
+  #Returns all data of the column in the knjdb-format.
+  def data
+    return {
+      type: type,
+      name: name,
+      null: null?,
+      maxlength: maxlength,
+      default: default,
+      primarykey: primarykey?,
+      autoincr: autoincr?
+    }
+  end
+
+  def reload
+    @args[:data] = @db.query("SHOW FULL COLUMNS FROM `#{@db.esc_table(table_name)}` WHERE `Field` = '#{@db.esc(name)}'").fetch
+    @type = nil
+  end
+
+  #Returns the type of the column (integer, varchar etc.).
+  def type
+    if !@type
+      if match = @args[:data][:Type].match(/^([A-z]+)$/)
+        @maxlength = false
+        @type = match[0].to_sym
+      elsif match = @args[:data][:Type].match(/^decimal\((\d+),(\d+)\)$/)
+        @maxlength = "#{match[1]},#{match[2]}"
+        @type = :decimal
+      elsif match = @args[:data][:Type].match(/^enum\((.+)\)$/)
+        @maxlength = match[1]
+        @type = :enum
+      elsif match = @args[:data][:Type].match(/^(.+)\((\d+)\)/)
+        @maxlength = match[2].to_i
+        @type = match[1].to_sym
+      end
+
+      raise "Still not type from: '#{@args[:data][:Type]}'." if @type.to_s.strip.empty?
+    end
+
+    return @type
+  end
+
+  #Return true if the columns allows null. Otherwise false.
+  def null?
+    return false if @args[:data][:Null] == "NO"
+    return true
+  end
+
+  #Returns the maxlength.
+  def maxlength
+    self.type unless @maxlength
+    return @maxlength if @maxlength
+    return false
+  end
+
+  #Returns the default value for the column.
+  def default
+    return false if (self.type == :datetime || self.type == :date) && @args[:data][:Default].to_s.strip.empty?
+    return false if (self.type == :int || self.type == :bigint) && @args[:data][:Default].to_s.strip.empty?
+    return false if !@args[:data][:Default]
+    return @args[:data][:Default]
+  end
+
+  #Returns true if the column is the primary key. Otherwise false.
+  def primarykey?
+    return true if @args[:data][:Key] == "PRI"
+    return false
+  end
+
+  #Returns true if the column is auto-increasing. Otherwise false.
+  def autoincr?
+    return true if @args[:data][:Extra].include?("auto_increment")
+    return false
+  end
+
+  #Returns the comment for the column.
+  def comment
+    return @args[:data][:Comment]
+  end
+
+  #Drops the column from the table.
+  def drop
+    @args[:db].query("ALTER TABLE `#{@db.esc_table(@args[:table_name])}` DROP COLUMN `#{@db.esc_col(self.name)}`")
+    table.__send__(:remove_column_from_list, self)
+    return nil
+  end
+
+  #Changes the column properties by the given hash.
+  def change(data)
+    col_escaped = "`#{@db.esc_col(name)}`"
+    table_escape = "`#{@db.esc_table(table_name)}`"
+    newdata = data.clone
+
+    newdata[:name] = name unless newdata.key?(:name)
+    newdata[:type] = type unless newdata.key?(:type)
+    newdata[:maxlength] = maxlength if !newdata.key?(:maxlength) && maxlength
+    newdata[:null] = null? unless newdata.key?(:null)
+    newdata[:default] = self.default if !newdata.key?(:default) && default
+    newdata.delete(:primarykey) if newdata.key?(:primarykey)
+
+    drop_add = true if name.to_s != newdata[:name].to_s
+
+    table.__send__(:remove_column_from_list, self) if drop_add
+    @db.query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@args[:db].cols.data_sql(newdata)}")
+    @name = newdata[:name].to_sym
+    reload
+    table.__send__(:add_column_to_list, self) if drop_add
+  end
+end

data/include/drivers/mysql/mysql_columns.rb

@@ -12,10 +12,10 @@ class Baza::Driver::Mysql::Columns
       raise "Invalid key: '#{key}' (#{key.class.name})." if !DATA_SQL_ALLOWED_KEYS.include?(key)
     end
 
-    raise "No type given." if !data[:type]
+    raise "No type given." unless data[:type]
     type = data[:type].to_sym
 
-    data[:maxlength] = 255 if type == :varchar and !data.key?(:maxlength)
+    data[:maxlength] = 255 if type == :varchar && !data.key?(:maxlength)
 
     sql = "`#{data[:name]}` #{type}"
     sql << "(#{data[:maxlength]})" if data[:maxlength]
@@ -25,138 +25,15 @@ class Baza::Driver::Mysql::Columns
 
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
-    elsif data.key?(:default) and data[:default] != false
+    elsif data.key?(:default) && data[:default] != false
       sql << " DEFAULT '#{@args[:db].escape(data[:default])}'"
     end
 
     sql << " COMMENT '#{@args[:db].escape(data[:comment])}'" if data.key?(:comment)
-    sql << " AFTER `#{@args[:db].esc_col(data[:after])}`" if data[:after] and !data[:first]
+    sql << " AFTER `#{@args[:db].esc_col(data[:after])}`" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
 
     return sql
   end
 end
-
-#This class handels every MySQL-column, that can be returned from a table-object.
-class Baza::Driver::Mysql::Columns::Column
-  attr_reader :args, :name
-
-  #Constructor. Should not be called manually.
-  def initialize(args)
-    @args = args
-    @name = @args[:data][:Field].to_sym
-    @db = @args[:db]
-  end
-
-  #Used to validate in Knj::Wrap_map.
-  def __object_unique_id__
-    return @name
-  end
-
-  #Returns the table-object that this column belongs to.
-  def table
-    return @args[:db].tables[@args[:table_name]]
-  end
-
-  #Returns all data of the column in the knjdb-format.
-  def data
-    return {
-      type: type,
-      name: name,
-      null: null?,
-      maxlength: maxlength,
-      default: default,
-      primarykey: primarykey?,
-      autoincr: autoincr?
-    }
-  end
-
-  #Returns the type of the column (integer, varchar etc.).
-  def type
-    if !@type
-      if match = @args[:data][:Type].match(/^([A-z]+)$/)
-        @maxlength = false
-        @type = match[0].to_sym
-      elsif match = @args[:data][:Type].match(/^decimal\((\d+),(\d+)\)$/)
-        @maxlength = "#{match[1]},#{match[2]}"
-        @type = :decimal
-      elsif match = @args[:data][:Type].match(/^enum\((.+)\)$/)
-        @maxlength = match[1]
-        @type = :enum
-      elsif match = @args[:data][:Type].match(/^(.+)\((\d+)\)/)
-        @maxlength = match[2].to_i
-        @type = match[1].to_sym
-      end
-
-      raise "Still not type from: '#{@args[:data][:Type]}'." if @type.to_s.strip.empty?
-    end
-
-    return @type
-  end
-
-  #Return true if the columns allows null. Otherwise false.
-  def null?
-    return false if @args[:data][:Null] == "NO"
-    return true
-  end
-
-  #Returns the maxlength.
-  def maxlength
-    self.type if !@maxlength
-    return @maxlength if @maxlength
-    return false
-  end
-
-  #Returns the default value for the column.
-  def default
-    return false if (self.type == :datetime or self.type == :date) and @args[:data][:Default].to_s.strip.length <= 0
-    return false if (self.type == :int or self.type == :bigint) and @args[:data][:Default].to_s.strip.length <= 0
-    return false if !@args[:data][:Default]
-    return @args[:data][:Default]
-  end
-
-  #Returns true if the column is the primary key. Otherwise false.
-  def primarykey?
-    return true if @args[:data][:Key] == "PRI"
-    return false
-  end
-
-  #Returns true if the column is auto-increasing. Otherwise false.
-  def autoincr?
-    return true if @args[:data][:Extra].include?("auto_increment")
-    return false
-  end
-
-  #Returns the comment for the column.
-  def comment
-    return @args[:data][:Comment]
-  end
-
-  #Drops the column from the table.
-  def drop
-    @args[:db].query("ALTER TABLE `#{@db.esc_table(@args[:table_name])}` DROP COLUMN `#{@db.esc_col(self.name)}`")
-    table = self.table.remove_column_from_list(self)
-    return nil
-  end
-
-  #Changes the column properties by the given hash.
-  def change(data)
-    col_escaped = "`#{@args[:db].esc_col(self.name)}`"
-    table_escape = "`#{@args[:db].esc_table(self.table.name)}`"
-    newdata = data.clone
-
-    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) and self.default
-    newdata.delete(:primarykey) if newdata.key?(:primarykey)
-
-    drop_add = true if self.name.to_s != newdata[:name].to_s
-
-    self.table.__send__(:remove_column_from_list, self) if drop_add
-    @args[:db].query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@args[:db].cols.data_sql(newdata)}")
-    self.table.__send__(:add_column_to_list, self) if drop_add
-  end
-end

data/include/drivers/mysql/mysql_index.rb

@@ -0,0 +1,76 @@
+class Baza::Driver::Mysql::Index
+  attr_reader :args, :columns
+
+  def initialize(args)
+    @args = args
+    @columns = []
+  end
+
+  #Used to validate in Knj::Wrap_map.
+  def __object_unique_id__
+    return @args[:data][:Key_name]
+  end
+
+  def name
+    return @args[:data][:Key_name]
+  end
+
+  def table
+    return @args[:db].tables[@args[:table_name]]
+  end
+
+  def drop
+    sql = "DROP INDEX `#{self.name}` ON `#{self.table.name}`"
+
+    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 rename newname
+    newname = newname.to_sym
+    create_args = data
+    create_args[:name] = newname
+
+    drop
+    table.create_indexes([create_args])
+    @args[:data][:Key_name] = newname
+  end
+
+  def data
+    return {
+      name: name,
+      columns: @columns
+    }
+  end
+
+  #Returns true if the index is a unique-index.
+  def unique?
+    if @args[:data][:Index_type] == "UNIQUE"
+      return true
+    else
+      return false
+    end
+  end
+
+  #Returns true if the index is a primary-index.
+  def primary?
+    return true if @args[:data][:Key_name] == "PRIMARY"
+    return false
+  end
+
+  def to_s
+    return "#<Baza::Driver::Mysql::Index name: \"#{name}\", columns: #{@columns}, primary: #{primary?}, unique: #{unique?}>"
+  end
+
+  def inspect
+    to_s
+  end
+end

data/include/drivers/mysql/mysql_indexes.rb

@@ -3,76 +3,3 @@ class Baza::Driver::Mysql::Indexes
     @args = args
   end
 end
-
-class Baza::Driver::Mysql::Indexes::Index
-  attr_reader :args, :columns
-
-  def initialize(args)
-    @args = args
-    @columns = []
-  end
-
-  #Used to validate in Knj::Wrap_map.
-  def __object_unique_id__
-    return @args[:data][:Key_name]
-  end
-
-  def name
-    return @args[:data][:Key_name]
-  end
-
-  def table
-    return @args[:db].tables[@args[:table_name]]
-  end
-
-  def drop
-    sql = "DROP INDEX `#{self.name}` ON `#{self.table.name}`"
-
-    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 rename newname
-    newname = newname.to_sym
-    create_args = data
-    create_args[:name] = newname
-
-    drop
-    table.create_indexes([create_args])
-    @args[:data][:Key_name] = newname
-  end
-
-  def data
-    return {
-      name: name,
-      columns: @columns
-    }
-  end
-
-  #Returns true if the index is a unique-index.
-  def unique?
-    if @args[:data][:Index_type] == "UNIQUE"
-      return true
-    else
-      return false
-    end
-  end
-
-  #Returns true if the index is a primary-index.
-  def primary?
-    return true if @args[:data][:Key_name] == "PRIMARY"
-    return false
-  end
-
-  def to_s
-    return "#<Baza::Driver::Mysql::Index name: \"#{name}\", columns: #{@columns}, primary: #{primary?}, unique: #{unique?}>"
-  end
-end

data/include/drivers/mysql/mysql_result.rb

@@ -0,0 +1,42 @@
+#This class controls the results for the normal MySQL-driver.
+class Baza::Driver::Mysql::Result
+  #Constructor. This should not be called manually.
+  def initialize(driver, result)
+    @driver = driver
+    @result = result
+    @mutex = Mutex.new
+
+    if @result
+      @keys = []
+      @result.fetch_fields.each do |key|
+        @keys << key.name.to_sym
+      end
+    end
+  end
+
+  #Returns a single result as a hash with symbols as keys.
+  def fetch
+    fetched = nil
+    @mutex.synchronize do
+      fetched = @result.fetch_row
+    end
+
+    return false unless fetched
+
+    ret = {}
+    count = 0
+    @keys.each do |key|
+      ret[key] = fetched[count]
+      count += 1
+    end
+
+    return ret
+  end
+
+  #Loops over every result yielding it.
+  def each
+    while data = self.fetch
+      yield(data)
+    end
+  end
+end

data/include/drivers/mysql/mysql_result_java.rb

@@ -0,0 +1,61 @@
+#This class controls the result for the Java-MySQL-driver.
+class Baza::Driver::Mysql::ResultJava
+  #Constructor. This should not be called manually.
+  def initialize(knjdb, opts, result)
+    @baza_db = knjdb
+    @result = result
+
+    if !opts.key?(:result) || opts[:result] == "hash"
+      @as_hash = true
+    elsif opts[:result] == "array"
+      @as_hash = false
+    else
+      raise "Unknown type of result: '#{opts[:result]}'."
+    end
+  end
+
+  #Reads meta-data about the query like keys and count.
+  def read_meta
+    @result.before_first
+    meta = @result.meta_data
+    @count = meta.column_count
+
+    @keys = []
+    1.upto(@count) do |count|
+      @keys << meta.column_label(count).to_sym
+    end
+  end
+
+  def fetch
+    return false unless @result
+    self.read_meta unless @keys
+    status = @result.next
+
+    unless status
+      @result = nil
+      @keys = nil
+      @count = nil
+      return false
+    end
+
+    if @as_hash
+      ret = {}
+      1.upto(@count) do |count|
+        ret[@keys[count - 1]] = @result.object(count)
+      end
+    else
+      ret = []
+      1.upto(@count) do |count|
+        ret << @result.object(count)
+      end
+    end
+
+    return ret
+  end
+
+  def each
+    while data = self.fetch
+      yield(data)
+    end
+  end
+end

data/include/drivers/mysql/mysql_result_mysql2.rb

@@ -0,0 +1,26 @@
+#This class controls the result for the MySQL2 driver.
+class Baza::Driver::Mysql::ResultMysql2
+  #Constructor. This should not be called manually.
+  def initialize(result)
+    @result = result
+  end
+
+  #Returns a single result.
+  def fetch
+    @enum = @result.to_enum if !@enum
+
+    begin
+      return @enum.next
+    rescue StopIteration
+      return false
+    end
+  end
+
+  #Loops over every single result yielding it.
+  def each
+    @result.each do |res|
+      next unless res #This sometimes happens when streaming results...
+      yield(res)
+    end
+  end
+end

data/include/drivers/mysql/mysql_result_unbuffered.rb

@@ -0,0 +1,72 @@
+#This class controls the unbuffered result for the normal MySQL-driver.
+class Baza::Driver::Mysql::ResultUnbuffered
+  #Constructor. This should not be called manually.
+  def initialize(conn, opts, result)
+    @conn = conn
+    @result = result
+
+    if !opts.key?(:result) || opts[:result] == "hash"
+      @as_hash = true
+    elsif opts[:result] == "array"
+      @as_hash = false
+    else
+      raise "Unknown type of result: '#{opts[:result]}'."
+    end
+  end
+
+  #Lods the keys for the object.
+  def load_keys
+    @keys = []
+    keys = @res.fetch_fields
+    keys.each do |key|
+      @keys << key.name.to_sym
+    end
+  end
+
+  #Returns a single result.
+  def fetch
+    if @enum
+      begin
+        ret = @enum.next
+      rescue StopIteration
+        @enum = nil
+        @res = nil
+      end
+    end
+
+    if !ret && !@res && !@enum
+      begin
+        @res = @conn.use_result
+        @enum = @res.to_enum
+        ret = @enum.next
+      rescue Mysql::Error
+        #Reset it to run non-unbuffered again and then return false.
+        @conn.query_with_result = true
+        return false
+      rescue StopIteration
+        sleep 0.1
+        retry
+      end
+    end
+
+    if !@as_hash
+      return ret
+    else
+      self.load_keys if !@keys
+
+      ret_h = {}
+      @keys.each_index do |key_no|
+        ret_h[@keys[key_no]] = ret[key_no]
+      end
+
+      return ret_h
+    end
+  end
+
+  #Loops over every single result yielding it.
+  def each
+    while data = self.fetch
+      yield(data)
+    end
+  end
+end

data/include/drivers/mysql/mysql_sqlspecs.rb

@@ -2,4 +2,4 @@ class Baza::Driver::Mysql::Sqlspecs < Baza::Sqlspecs
   def strftime(val, colstr)
     return "DATE_FORMAT(#{colstr}, '#{val}')"
   end
-end
+end