baza 0.0.0 → 0.0.1

data/include/drivers/mysql/mysql_tables.rb

@@ -21,7 +21,7 @@ class Baza::Driver::Mysql::Tables
   
   #Returns a table by the given table-name.
   def [](table_name)
-    table_name = table_name.to_s
+    table_name = table_name.to_sym
     
     begin
       return @list[table_name]
@@ -45,20 +45,22 @@ class Baza::Driver::Mysql::Tables
     
     @list_mutex.synchronize do
       @db.q(sql) do |d_tables|
-        obj = @list.get!(d_tables[:Name])
+        name = d_tables[:Name].to_sym
+        obj = @list.get!(name)
         
         if !obj
           obj = Baza::Driver::Mysql::Tables::Table.new(
             :db => @db,
-            :data => d_tables
+            :data => d_tables,
+            :tables => self
           )
-          @list[d_tables[:Name]] = obj
+          @list[name] = obj
         end
         
         if block_given?
           yield(obj)
         else
-          ret[d_tables[:Name]] = obj
+          ret[name] = obj
         end
       end
     end
@@ -70,25 +72,26 @@ class Baza::Driver::Mysql::Tables
     end
   end
   
+  CREATE_ALLOWED_KEYS = [:columns, :indexes, :temp, :return_sql]
   #Creates a new table by the given name and data.
   def create(name, data, args = nil)
-    raise "No columns was given for '#{name}'." if !data["columns"] or data["columns"].empty?
+    raise "No columns was given for '#{name}'." if !data[:columns] or data[:columns].empty?
     
     sql = "CREATE"
-    sql << " TEMPORARY" if data["temp"]
+    sql << " TEMPORARY" if data[:temp]
     sql << " TABLE `#{name}` ("
     
     first = true
-    data["columns"].each do |col_data|
+    data[:columns].each do |col_data|
       sql << ", " if !first
       first = false if first
-      col_data.delete("after") if col_data["after"]
+      col_data.delete(:after) if col_data[:after]
       sql << @db.cols.data_sql(col_data)
     end
     
-    if data["indexes"] and !data["indexes"].empty?
+    if data[:indexes] and !data[:indexes].empty?
       sql << ", "
-      sql << Baza::Driver::Mysql::Tables::Table.create_indexes(data["indexes"], {
+      sql << Baza::Driver::Mysql::Tables::Table.create_indexes(data[:indexes], {
         :db => @db,
         :return_sql => true,
         :create => false,
@@ -102,10 +105,22 @@ class Baza::Driver::Mysql::Tables
     return [sql] if args and args[:return_sql]
     @db.query(sql)
   end
+  
+  private
+  
+  def add_to_list(table)
+    raise "Already exists: '#{table.name}'." if @list.key?(table.name) and @list[table.name].__id__ != table.__id__
+    @list[table.name] = table
+  end
+  
+  def remove_from_list(table)
+    raise "Table not in list: '#{table.name}'." if !@list.key?(table.name)
+    @list.delete(table.name)
+  end
 end
 
 class Baza::Driver::Mysql::Tables::Table
-  attr_reader :list
+  attr_reader :list, :name
   
   def initialize(args)
     @args = args
@@ -114,6 +129,8 @@ class Baza::Driver::Mysql::Tables::Table
     @subtype = @db.opts[:subtype]
     @list = Wref_map.new
     @indexes_list = Wref_map.new
+    @name = @data[:Name].to_sym
+    @tables = args[:tables]
     
     raise "Could not figure out name from: '#{@data}'." if @data[:Name].to_s.strip.length <= 0
   end
@@ -127,13 +144,11 @@ class Baza::Driver::Mysql::Tables::Table
     return @data[:Name]
   end
   
-  def name
-    return @data[:Name]
-  end
-  
   def drop
     raise "Cant drop native table: '#{self.name}'." if self.native?
-    @db.query("DROP TABLE `#{self.name}`")
+    @db.query("DROP TABLE `#{@db.esc_table(self.name)}`")
+    @tables.__send__(:remove_from_list, self)
+    return nil
   end
   
   #Returns true if the table is safe to drop.
@@ -143,16 +158,16 @@ class Baza::Driver::Mysql::Tables::Table
   end
   
   def optimize
-    @db.query("OPTIMIZE TABLE `#{self.name}`")
+    @db.query("OPTIMIZE TABLE `#{@db.esc_table(self.name)}`")
     return self
   end
   
   def rows_count
-    return @data[:Rows].to_i
+    return @db.q("SELECT COUNT(*) AS count FROM `#{@db.esc_table(self.name)}`").fetch[:count].to_i
   end
   
   def column(name)
-    name = name.to_s
+    name = name.to_sym
     
     if col = @list.get!(name)
       return @list[name]
@@ -168,11 +183,12 @@ class Baza::Driver::Mysql::Tables::Table
   def columns(args = nil)
     @db.cols
     ret = {}
-    sql = "SHOW FULL COLUMNS FROM `#{self.name}`"
+    sql = "SHOW FULL COLUMNS FROM `#{@db.esc_table(self.name)}`"
     sql << " WHERE `Field` = '#{@db.esc(args[:name])}'" if args and args.key?(:name)
     
     @db.q(sql) do |d_cols|
-      obj = @list.get!(d_cols[:Field].to_s)
+      name = d_cols[:Field].to_sym
+      obj = @list.get!(name)
       
       if !obj
         obj = Baza::Driver::Mysql::Columns::Column.new(
@@ -180,13 +196,13 @@ class Baza::Driver::Mysql::Tables::Table
           :db => @db,
           :data => d_cols
         )
-        @list[d_cols[:Field].to_s] = obj
+        @list[name] = obj
       end
       
       if block_given?
         yield(obj)
       else
-        ret[d_cols[:Field].to_s] = obj
+        ret[name] = obj
       end
     end
     
@@ -201,7 +217,7 @@ class Baza::Driver::Mysql::Tables::Table
     @db.indexes
     ret = {}
     
-    sql = "SHOW INDEX FROM `#{self.name}`"
+    sql = "SHOW INDEX FROM `#{@db.esc_table(self.name)}`"
     sql << " WHERE `Key_name` = '#{@db.esc(args[:name])}'" if args and args.key?(:name)
     
     @db.q(sql) do |d_indexes|
@@ -248,9 +264,11 @@ class Baza::Driver::Mysql::Tables::Table
   end
   
   def create_columns(col_arr)
-    col_arr.each do |col_data|
-      sql = "ALTER TABLE `#{self.name}` ADD COLUMN #{@db.cols.data_sql(col_data)};"
-      @db.query(sql)
+    @db.transaction do
+      col_arr.each do |col_data|
+        sql = "ALTER TABLE `#{self.name}` ADD COLUMN #{@db.cols.data_sql(col_data)};"
+        @db.query(sql)
+      end
     end
   end
   
@@ -275,12 +293,12 @@ class Baza::Driver::Mysql::Tables::Table
         sql << "CREATE"
       end
       
-      if index_data.is_a?(String)
-        index_data = {"name" => index_data, "columns" => [index_data]}
+      if index_data.is_a?(String) or index_data.is_a?(Symbol)
+        index_data = {:name => index_data, :columns => [index_data]}
       end
       
-      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?
+      raise "No name was given: '#{index_data}'." if !index_data.key?(:name) or index_data[:name].to_s.strip.empty?
+      raise "No columns was given on index: '#{index_data[:name]}'." if !index_data[:columns] or index_data[:columns].empty?
       
       if args[:return_sql]
         if first
@@ -290,8 +308,8 @@ class Baza::Driver::Mysql::Tables::Table
         end
       end
       
-      sql << " UNIQUE" if index_data["unique"]
-      sql << " INDEX `#{db.esc_col(index_data["name"])}`"
+      sql << " UNIQUE" if index_data[:unique]
+      sql << " INDEX `#{db.esc_col(index_data[:name])}`"
       
       if args[:on_table] or !args.key?(:on_table)
         sql << " ON `#{db.esc_table(args[:table_name])}`"
@@ -300,7 +318,7 @@ class Baza::Driver::Mysql::Tables::Table
       sql << " ("
       
       first = true
-      index_data["columns"].each do |col_name|
+      index_data[:columns].each do |col_name|
         sql << ", " if !first
         first = false if first
         
@@ -322,31 +340,35 @@ class Baza::Driver::Mysql::Tables::Table
   end
   
   def rename(newname)
+    newname = newname.to_sym
     oldname = self.name
-    @db.query("ALTER TABLE `#{oldname}` RENAME TO `#{newname}`")
-    @db.tables.list[newname] = self
-    @db.tables.list.delete(oldname)
+    
+    @tables.__send__(:remove_from_list, self)
+    @db.query("ALTER TABLE `#{@db.esc_table(oldname)}` RENAME TO `#{@db.esc_table(newname)}`")
+    
     @data[:Name] = newname
+    @name = newname
+    @tables.__send__(:add_to_list, self)
   end
   
   def truncate
-    @db.query("TRUNCATE `#{self.name}`")
+    @db.query("TRUNCATE `#{@db.esc_table(self.name)}`")
     return self
   end
   
   def data
     ret = {
-      "name" => self.name,
-      "columns" => [],
-      "indexes" => []
+      :name => self.name,
+      :columns => [],
+      :indexes => []
     }
     
     columns.each do |name, column|
-      ret["columns"] << column.data
+      ret[:columns] << column.data
     end
     
     indexes.each do |name, index|
-      ret["indexes"] << index.data if name != "PRIMARY"
+      ret[:indexes] << index.data if name != "PRIMARY"
     end
     
     return ret
@@ -356,11 +378,6 @@ class Baza::Driver::Mysql::Tables::Table
     @db.insert(self.name, data)
   end
   
-  #Returns the current engine of the table.
-  def engine
-		return @data[:Engine]
-  end
-  
   def clone(newname, args = {})
     raise "Invalid name." if newname.to_s.strip.empty?
     
@@ -374,19 +391,19 @@ class Baza::Driver::Mysql::Tables::Table
       first = false if first
       
       col_data = col.data
-      pkey_found = true if !pkey_found and col_data["primarykey"] and args[:force_single_pkey]
+      pkey_found = true if !pkey_found and col_data[:primarykey] and args[:force_single_pkey]
       
-      if args[:no_pkey] or (pkey_found and col_data["primarykey"] and args[:force_single_pkey])
-				col_data["primarykey"] = false
+      if args[:no_pkey] or (pkey_found and col_data[:primarykey] and args[:force_single_pkey])
+				col_data[:primarykey] = false
 			end
 			
-			if col_data["primarykey"]
-				pkeys << col_data["name"]
-				col_data.delete("primarykey")
+			if col_data[:primarykey]
+				pkeys << col_data[:name]
+				col_data.delete(:primarykey)
 			end
 			
 			if args[:all_cols_storage]
-				col_data["storage"] = args[:all_cols_storage]
+				col_data[:storage] = args[:all_cols_storage]
 			end
 			
       sql << @db.cols.data_sql(col_data)
@@ -410,14 +427,12 @@ class Baza::Driver::Mysql::Tables::Table
     sql << " ENGINE=#{args[:engine]}" if args[:engine]
     sql << ";"
     
-    puts sql
-    
     #Create table.
     @db.query(sql)
     
     
     #Insert data of previous data in a single query.
-    @db.query("INSERT INTO `#{newname}` SELECT * FROM `#{self.name}`")
+    @db.query("INSERT INTO `#{@db.esc_table(newname)}` SELECT * FROM `#{@db.esc_table(self.name)}`")
     
     
     #Create indexes.
@@ -434,10 +449,27 @@ class Baza::Driver::Mysql::Tables::Table
     return new_table
   end
   
+  #Returns the current engine of the table.
+  def engine
+    return @data[:Engine]
+  end
+  
   #Changes the engine for a table.
   def engine=(newengine)
 		raise "Invalid engine: '#{newengine}'." if !newengine.to_s.match(/^[A-z]+$/)
 		@db.query("ALTER TABLE `#{@db.esc_table(self.name)}` ENGINE = #{newengine}") if self.engine.to_s != newengine.to_s
 		@data[:Engine] = newengine
   end
+  
+  private
+  
+  def remove_column_from_list(col)
+    raise "Column not found: '#{col.name}'." if !@list.key?(col.name)
+    @list.delete(col.name)
+  end
+  
+  def add_column_to_list(col)
+    raise "Column already exists: '#{col.name}'." if @list.key?(col.name)
+    @list[col.name] = col
+  end
 end

data/include/drivers/sqlite3/sqlite3.rb

@@ -3,6 +3,21 @@ class Baza::Driver::Sqlite3
   attr_reader :knjdb, :conn, :sep_table, :sep_col, :sep_val, :symbolize
   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 == "SQLite3::Database"
+      return {
+        :type => :success,
+        :args => {
+          :type => "sqlite3",
+          :conn => args[:object]
+        }
+      }
+    end
+    
+    return nil
+  end
+  
   #Constructor. This should not be called manually.
   def initialize(knjdb_ob)
     @sep_table = "`"
@@ -12,52 +27,51 @@ class Baza::Driver::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.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] == "java"
-      if @knjdb.opts[:sqlite_driver]
-        require @knjdb.opts[:sqlite_driver]
+    if @knjdb.opts[:conn]
+      @conn = @knjdb.opts[:conn]
+    else
+      raise "No path was given." if !@path
+      
+      if @knjdb.opts[:subtype] == "java"
+        if @knjdb.opts[:sqlite_driver]
+          require @knjdb.opts[:sqlite_driver]
+        else
+          require "#{File.dirname(__FILE__)}/../../../jruby/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
-        require "#{File.dirname(__FILE__)}/../../../jruby/sqlitejdbc-v056.jar"
+        @conn = SQLite3::Database.open(@path)
+        @conn.results_as_hash = true
+        @conn.type_translation = false
       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)
-      @conn.results_as_hash = true
-      @conn.type_translation = false
     end
   end
   
   #Executes a query against the driver.
   def query(string)
-    begin
-      if @knjdb.opts[:subtype] == "rhodes"
-        return Baza::Driver::Sqlite3_result.new(self, @conn.execute(string, string))
-      elsif @knjdb.opts[:subtype] == "java"
-        begin
-          return Baza::Driver::Sqlite3_result_java.new(self, @stat.executeQuery(string))
-        rescue java.sql.SQLException => e
-          if e.message.to_s.index("query does not return ResultSet") != nil
-            return Baza::Driver::Sqlite3_result_java.new(self, nil)
-          else
-            raise e
-          end
+    if @knjdb.opts[:subtype] == :rhodes
+      return Baza::Driver::Sqlite3::Result.new(self, @conn.execute(string, string))
+    elsif @knjdb.opts[:subtype] == :java
+      begin
+        return Baza::Driver::Sqlite3::ResultJava.new(self, @stat.executeQuery(string))
+      rescue java.sql.SQLException => e
+        if e.message.to_s.index("query does not return ResultSet") != nil
+          return Baza::Driver::Sqlite3::ResultJava.new(self, nil)
+        else
+          raise e
         end
-      else
-        return Baza::Driver::Sqlite3_result.new(self, @conn.execute(string))
       end
-    rescue => e
-      #Add SQL to the error message.
-      raise e.class, "#{e.message} (SQL: #{string})"
+    else
+      return Baza::Driver::Sqlite3::Result.new(self, @conn.execute(string))
     end
   end
   
@@ -98,10 +112,24 @@ class Baza::Driver::Sqlite3
       yield(@knjdb)
     end
   end
+  
+  def insert_multi(tablename, arr_hashes, args = nil)
+    sql = [] if args and args[:return_sql]
+    
+    @knjdb.transaction do
+      arr_hashes.each do |hash|
+        res = @knjdb.insert(tablename, hash, args)
+        sql << res if args and args[:return_sql]
+      end
+    end
+    
+    return sql if args and args[:return_sql]
+    return nil
+  end
 end
 
 #This class handels results when running in JRuby.
-class Baza::Driver::Sqlite3_result_java
+class Baza::Driver::Sqlite3::ResultJava
   def initialize(driver, rs)
     @index = 0
     retkeys = driver.knjdb.opts[:return_keys]
@@ -114,8 +142,7 @@ class Baza::Driver::Sqlite3_result_java
       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"
+          col_name = metadata.getColumnName(i).to_sym
           row_data[col_name] = rs.getString(i)
         end
         
@@ -142,17 +169,11 @@ class Baza::Driver::Sqlite3_result_java
 end
 
 #This class handels the result when running MRI (or others).
-class Baza::Driver::Sqlite3_result
+class Baza::Driver::Sqlite3::Result
   #Constructor. This should not be called manually.
   def initialize(driver, result_array)
     @result_array = result_array
     @index = 0
-    
-    if driver.knjdb.opts[:return_keys] == "symbols"
-      @symbols = true
-    else
-      @symbols = false
-    end
   end
   
   #Returns a single result.
@@ -165,7 +186,7 @@ class Baza::Driver::Sqlite3_result
     result_hash.each do |key, val|
       if (Float(key) rescue false)
         #do nothing.
-      elsif @symbols and !key.is_a?(Symbol)
+      elsif !key.is_a?(Symbol)
         ret[key.to_sym] = val
       else
         ret[key] = val

data/include/drivers/sqlite3/sqlite3_columns.rb

@@ -7,37 +7,39 @@ class Baza::Driver::Sqlite3::Columns
     @args = args
   end
   
+  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames]
   #Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
-    raise "No type given." if !data["type"]
-    type = data["type"].to_s
+    data.each do |key, val|
+      raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
+    end
+    
+    raise "No type given." if !data[:type]
+    type = data[:type].to_sym
     
-    if type == "enum"
-      type = "varchar"
-      data.delete("maxlength")
+    if type == :enum
+      type = :varchar
+      data.delete(:maxlength)
     end
     
-    data["maxlength"] = 255 if type == "varchar" and !data.key?("maxlength")
-    data["maxlength"] = 11 if type == "int" and !data.key?("maxlength") and !data["autoincr"] and !data["primarykey"]
-    type = "integer" if @args[:db].int_types.index(type) and (data["autoincr"] or data["primarykey"])
+    data[:maxlength] = 255 if type == :varchar and !data.key?(:maxlength)
+    data[:maxlength] = 11 if type == :int and !data.key?(:maxlength) and !data[:autoincr] and !data[:primarykey]
+    type = :integer if @args[: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 << " PRIMARY KEY" if data["primarykey"]
-    sql << " AUTOINCREMENT" if data["autoincr"]
+    sql = "`#{data[:name]}` #{type}"
+    sql << "(#{data[:maxlength]})" if data[:maxlength] and !data[:autoincr]
+    sql << " PRIMARY KEY" if data[:primarykey]
+    sql << " AUTOINCREMENT" if data[:autoincr]
     
-    if !data["null"] and data.key?("null")
+    if !data[:null] and data.key?(:null)
       sql << " NOT NULL"
-      
-      if !data.key?("default") or !data["default"]
-        data["default"] = 0 if type == "int"
-      end
+      data[:default] = 0 if type == :int if !data.key?(:default) or !data[:default]
     end
     
-    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
     
     return sql
@@ -67,13 +69,13 @@ class Baza::Driver::Sqlite3::Columns::Column
   #Returns the data of the column as a hash in 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
   
@@ -133,7 +135,7 @@ class Baza::Driver::Sqlite3::Columns::Column
       def_val = def_val.to_s.slice(0, def_val.length - 1)
     end
     
-    return false if @args[:data][:dflt_value].to_s.length == 0
+    return false if @args[:data][:dflt_value].to_s.empty?
     return def_val
   end
   
@@ -145,32 +147,32 @@ class Baza::Driver::Sqlite3::Columns::Column
   
   #Returns true if the column is auto-increasing.
   def autoincr?
-    return true if @args[:data][:pk].to_i == 1 and @args[:data][:type].to_s == "integer"
+    return true if @args[:data][:pk].to_i == 1 and @args[:data][:type].to_sym == :integer
     return false
   end
   
   #Drops the column from the table.
   def drop
-    self.table.copy("drops" => self.name)
+    self.table.copy(:drops => self.name)
   end
   
   #Changes data on the column. Like the name, type, maxlength or whatever.
   def change(data)
     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")
-    newdata["primarykey"] = self.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)
+    newdata[:primarykey] = self.primarykey? if !newdata.key?(:primarykey)
     
     @type = nil
     @maxlength = nil
     
     new_table = self.table.copy(
-      "alter_columns" => {
-        self.name.to_s => newdata
+      :alter_columns => {
+        self.name.to_sym => newdata
       }
     )
   end

data/include/drivers/sqlite3/sqlite3_indexes.rb

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