baza 0.0.0 → 0.0.1

data/include/drivers/mysql/mysql.rb

@@ -2,6 +2,22 @@ class Baza::Driver::Mysql
   attr_reader :knjdb, :conn, :conns, :sep_table, :sep_col, :sep_val
   attr_accessor :tables, :cols, :indexes
   
+  #Helper to enable automatic registering of database using Baza::Db.from_object
+  def self.from_object(args)
+    if args[:object].class.name == "Mysql2::Client"
+      return {
+        :type => :success,
+        :args => {
+          :type => :mysql,
+          :subtype => :mysql2,
+          :conn => args[:object]
+        }
+      }
+    end
+    
+    return nil
+  end
+  
   def initialize(knjdb_ob)
     @knjdb = knjdb_ob
     @opts = @knjdb.opts
@@ -26,7 +42,7 @@ class Baza::Driver::Mysql
     
     @java_rs_data = {}
     @subtype = @knjdb.opts[:subtype]
-    @subtype = "mysql" if @subtype.to_s.length <= 0
+    @subtype = :mysql if @subtype.to_s.empty?
     self.reconnect
   end
   
@@ -49,9 +65,9 @@ class Baza::Driver::Mysql
   def reconnect
     @mutex.synchronize do
       case @subtype
-        when "mysql"
+        when :mysql
           @conn = Mysql.real_connect(@knjdb.opts[:host], @knjdb.opts[:user], @knjdb.opts[:pass], @knjdb.opts[:db], @port)
-        when "mysql2"
+        when :mysql2
           require "rubygems"
           require "mysql2"
           
@@ -79,7 +95,11 @@ class Baza::Driver::Mysql
           tries = 0
           begin
             tries += 1
-            @conn = Mysql2::Client.new(args)
+            if @knjdb.opts[:conn]
+              @conn = @knjdb.opts[:conn]
+            else
+              @conn = Mysql2::Client.new(args)
+            end
           rescue => e
             if tries <= 3
               if e.message == "Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (111)"
@@ -90,7 +110,7 @@ class Baza::Driver::Mysql
             
             raise e
           end
-        when "java"
+        when :java
           if !@jdbc_loaded
             require "java"
             require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
@@ -101,7 +121,7 @@ class Baza::Driver::Mysql
           @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}&holdResultsOpenOverStatementClose=true")
           self.query("SET SQL_MODE = ''")
         else
-          raise "Unknown subtype: #{@subtype}"
+          raise "Unknown subtype: #{@subtype} (#{@subtype.class.name})"
       end
       
       self.query("SET NAMES '#{self.esc(@encoding)}'") if @encoding
@@ -118,11 +138,11 @@ class Baza::Driver::Mysql
       tries += 1
       @mutex.synchronize do
         case @subtype
-          when "mysql"
-            return Baza::Driver::Mysql_result.new(self, @conn.query(str))
-          when "mysql2"
-            return Baza::Driver::Mysql2_result.new(@conn.query(str, @query_args))
-          when "java"
+          when :mysql
+            return Baza::Driver::Mysql::Result.new(self, @conn.query(str))
+          when :mysql2
+            return Baza::Driver::Mysql::ResultMySQL2.new(@conn.query(str, @query_args))
+          when :java
             stmt = conn.create_statement
             
             if str.match(/^\s*(delete|update|create|drop|insert\s+into|alter)\s+/i)
@@ -138,7 +158,7 @@ class Baza::Driver::Mysql
               
               begin
                 res = stmt.execute_query(str)
-                ret = KnjDB_java_mysql_result.new(@knjdb, @opts, res)
+                ret = Baza::Driver::Mysql::ResultJava.new(@knjdb, @opts, res)
                 id = ret.__id__
                 
                 #If ID is being reused we have to free the result.
@@ -180,12 +200,12 @@ class Baza::Driver::Mysql
   def query_ubuf(str)
     @mutex.synchronize do
       case @subtype
-        when "mysql"
+        when :mysql
           @conn.query_with_result = false
-          return Baza::Driver::Mysql_unbuffered_result.new(@conn, @opts, @conn.query(str))
-        when "mysql2"
-          return Baza::Driver::Mysql2_result.new(@conn.query(str, @query_args.merge(:stream => true)))
-        when "java"
+          return Baza::Driver::Mysql::ResultUnbuffered.new(@conn, @opts, @conn.query(str))
+        when :mysql2
+          return Baza::Driver::Mysql::ResultMySQL2.new(@conn.query(str, @query_args.merge(:stream => true)))
+        when :java
           if str.match(/^\s*(delete|update|create|drop|insert\s+into)\s+/i)
             stmt = @conn.createStatement
             
@@ -202,7 +222,7 @@ class Baza::Driver::Mysql
             
             begin
               res = stmt.executeQuery(str)
-              ret = KnjDB_java_mysql_result.new(@knjdb, @opts, res)
+              ret = Baza::Driver::Mysql::ResultJava.new(@knjdb, @opts, res)
               
               #Save reference to result and statement, so we can close them when they are garbage collected.
               @java_rs_data[ret.__id__] = {:res => res, :stmt => stmt}
@@ -224,11 +244,11 @@ class Baza::Driver::Mysql
   #Escapes a string to be safe to use in a query.
   def escape_alternative(string)
     case @subtype
-      when "mysql"
+      when :mysql
         return @conn.escape_string(string.to_s)
-      when "mysql2"
+      when :mysql2
         return @conn.escape(string.to_s)
-      when "java"
+      when :java
         return self.escape(string)
       else
         raise "Unknown subtype: '#{@subtype}'."
@@ -261,15 +281,15 @@ class Baza::Driver::Mysql
   #Returns the last inserted ID for the connection.
   def lastID
     case @subtype
-      when "mysql"
+      when :mysql
         @mutex.synchronize do
           return @conn.insert_id.to_i
         end
-      when "mysql2"
+      when :mysql2
         @mutex.synchronize do
           return @conn.last_id.to_i
         end
-      when "java"
+      when :java
         data = self.query("SELECT LAST_INSERT_ID() AS id").fetch
         return data[:id].to_i if data.key?(:id)
         raise "Could not figure out last inserted ID."
@@ -384,7 +404,7 @@ class Baza::Driver::Mysql
 end
 
 #This class controls the results for the normal MySQL-driver.
-class Baza::Driver::Mysql_result
+class Baza::Driver::Mysql::Result
   #Constructor. This should not be called manually.
   def initialize(driver, result)
     @driver = driver
@@ -393,28 +413,14 @@ class Baza::Driver::Mysql_result
     
     if @result
       @keys = []
-      keys = @result.fetch_fields
-      keys.each do |key|
+      @result.fetch_fields.each do |key|
         @keys << key.name.to_sym
       end
     end
   end
   
-  #Returns a single result.
-  def fetch
-    return self.fetch_hash_symbols if @driver.knjdb.opts[:return_keys] == "symbols"
-    return self.fetch_hash_strings
-  end
-  
-  #Returns a single result as a hash with strings as keys.
-  def fetch_hash_strings
-    @mutex.synchronize do
-      return @result.fetch_hash
-    end
-  end
-  
   #Returns a single result as a hash with symbols as keys.
-  def fetch_hash_symbols
+  def fetch
     fetched = nil
     @mutex.synchronize do
       fetched = @result.fetch_row
@@ -434,14 +440,14 @@ class Baza::Driver::Mysql_result
   
   #Loops over every result yielding it.
   def each
-    while data = self.fetch_hash_symbols
+    while data = self.fetch
       yield(data)
     end
   end
 end
 
 #This class controls the unbuffered result for the normal MySQL-driver.
-class Baza::Driver::Mysql_unbuffered_result
+class Baza::Driver::Mysql::ResultUnbuffered
   #Constructor. This should not be called manually.
   def initialize(conn, opts, result)
     @conn = conn
@@ -514,7 +520,7 @@ class Baza::Driver::Mysql_unbuffered_result
 end
 
 #This class controls the result for the MySQL2 driver.
-class Baza::Driver::Mysql2_result
+class Baza::Driver::Mysql::ResultMySQL2
   #Constructor. This should not be called manually.
   def initialize(result)
     @result = result
@@ -534,15 +540,14 @@ class Baza::Driver::Mysql2_result
   #Loops over every single result yielding it.
   def each
     @result.each do |res|
-      #This sometimes happens when streaming results...
-      next if !res
+      next if !res #This sometimes happens when streaming results...
       yield(res)
     end
   end
 end
 
 #This class controls the result for the Java-MySQL-driver.
-class KnjDB_java_mysql_result
+class Baza::Driver::Mysql::ResultJava
   #Constructor. This should not be called manually.
   def initialize(knjdb, opts, result)
     @knjdb = knjdb

data/include/drivers/mysql/mysql_columns.rb

@@ -6,27 +6,33 @@ class Baza::Driver::Mysql::Columns
   end
   
   #Returns the SQL for this column.
+  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null]
   def data_sql(data)
-    raise "No type given." if !data["type"]
+    data.each do |key, val|
+      raise "Invalid key: '#{key}' (#{key.class.name})." if !DATA_SQL_ALLOWED_KEYS.include?(key)
+    end
+    
+    raise "No type given." if !data[:type]
+    type = data[:type].to_sym
     
-    data["maxlength"] = 255 if data["type"] == "varchar" and !data.key?("maxlength")
+    data[:maxlength] = 255 if type == :varchar and !data.key?(:maxlength)
     
-    sql = "`#{data["name"]}` #{data["type"]}"
-    sql << "(#{data["maxlength"]})" if data["maxlength"]
-    sql << " PRIMARY KEY" if data["primarykey"]
-    sql << " AUTO_INCREMENT" if data["autoincr"]
-    sql << " NOT NULL" if !data["null"]
+    sql = "`#{data[:name]}` #{type}"
+    sql << "(#{data[:maxlength]})" if data[:maxlength]
+    sql << " PRIMARY KEY" if data[:primarykey]
+    sql << " AUTO_INCREMENT" if data[:autoincr]
+    sql << " NOT NULL" if !data[:null]
     
-    if data.key?("default_func")
-      sql << " DEFAULT #{data["default_func"]}"
-    elsif data.key?("default") and data["default"] != false
-      sql << " DEFAULT '#{@args[:db].escape(data["default"])}'"
+    if data.key?(:default_func)
+      sql << " DEFAULT #{data[:default_func]}"
+    elsif data.key?(:default) and 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 << " FIRST" if data["first"]
-    sql << " STORAGE #{data["storage"].to_s.upcase}" if data["storage"]
+    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 << " FIRST" if data[:first]
+    sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
     
     return sql
   end
@@ -34,21 +40,18 @@ end
 
 #This class handels every MySQL-column, that can be returned from a table-object.
 class Baza::Driver::Mysql::Columns::Column
-  attr_reader :args
+  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 @args[:data][:Field]
-  end
-  
-  #Returns the name of the column.
-  def name
-    return @args[:data][:Field]
+    return @name
   end
   
   #Returns the table-object that this column belongs to.
@@ -59,13 +62,13 @@ class Baza::Driver::Mysql::Columns::Column
   #Returns all data of the column in the knjdb-format.
   def data
     return {
-      "type" => self.type,
-      "name" => self.name,
-      "null" => self.null?,
-      "maxlength" => self.maxlength,
-      "default" => self.default,
-      "primarykey" => self.primarykey?,
-      "autoincr" => self.autoincr?
+      :type => self.type,
+      :name => self.name,
+      :null => self.null?,
+      :maxlength => self.maxlength,
+      :default => self.default,
+      :primarykey => self.primarykey?,
+      :autoincr => self.autoincr?
     }
   end
   
@@ -86,7 +89,7 @@ class Baza::Driver::Mysql::Columns::Column
         @type = match[1].to_sym
       end
       
-      raise "Still not type from: '#{@args[:data][:Type]}'." if @type.to_s.strip.length <= 0
+      raise "Still not type from: '#{@args[:data][:Type]}'." if @type.to_s.strip.empty?
     end
     
     return @type
@@ -107,8 +110,8 @@ class Baza::Driver::Mysql::Columns::Column
   
   #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 (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
@@ -121,7 +124,7 @@ class Baza::Driver::Mysql::Columns::Column
   
   #Returns true if the column is auto-increasing. Otherwise false.
   def autoincr?
-    return true if @args[:data][:Extra].index("auto_increment") != nil
+    return true if @args[:data][:Extra].include?("auto_increment")
     return false
   end
   
@@ -132,7 +135,8 @@ class Baza::Driver::Mysql::Columns::Column
   
   #Drops the column from the table.
   def drop
-    @args[:db].query("ALTER TABLE `#{@args[:table_name]}` DROP COLUMN `#{self.name}`")
+    @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
   
@@ -142,14 +146,17 @@ class Baza::Driver::Mysql::Columns::Column
     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")
+    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
     
-    type_s = newdata["type"].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_indexes.rb

@@ -42,8 +42,8 @@ class Baza::Driver::Mysql::Indexes::Index
   
   def data
     return {
-      "name" => name,
-      "columns" => @columns
+      :name => name,
+      :columns => @columns
     }
   end