baza 0.0.14 → 0.0.15

data/include/drivers/mysql/mysql_tables.rb

@@ -29,11 +29,16 @@ class Baza::Driver::Mysql::Tables
       #ignore.
     end
 
-    self.list(:name => table_name) do |table_obj|
+    tables = []
+    list(name: table_name) do |table_obj|
       return table_obj if table_obj.name == table_name
     end
 
-    raise Errno::ENOENT, "Table was not found: #{table_name}."
+    list do |table_obj|
+      tables << table_obj.name
+    end
+
+    raise Errno::ENOENT, "Table was not found: '#{table_name}' (#{table_name.class.name}) (tables: #{tables})."
   end
 
   #Yields the tables of the current database.
@@ -50,10 +55,10 @@ class Baza::Driver::Mysql::Tables
         obj = @list.get!(name)
 
         if !obj
-          obj = Baza::Driver::Mysql::Tables::Table.new(
-            :db => @db,
-            :data => d_tables,
-            :tables => self
+          obj = Baza::Driver::Mysql::Table.new(
+            db: @db,
+            data: d_tables,
+            tables: self
           )
           @list[name] = obj
         end
@@ -76,7 +81,7 @@ class Baza::Driver::Mysql::Tables
   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] || data[:columns].empty?
 
     sql = "CREATE"
     sql << " TEMPORARY" if data[:temp]
@@ -84,401 +89,38 @@ class Baza::Driver::Mysql::Tables
 
     first = true
     data[:columns].each do |col_data|
-      sql << ", " if !first
+      sql << ", " unless first
       first = false if first
       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] && !data[:indexes].empty?
       sql << ", "
-      sql << Baza::Driver::Mysql::Tables::Table.create_indexes(data[:indexes], {
-        :db => @db,
-        :return_sql => true,
-        :create => false,
-        :on_table => false,
-        :table_name => name
+      sql << Baza::Driver::Mysql::Table.create_indexes(data[:indexes], {
+        db: @db,
+        return_sql: true,
+        create: false,
+        on_table: false,
+        table_name: name
       })
     end
 
     sql << ")"
 
-    return [sql] if args and args[:return_sql]
+    return [sql] if args && 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__
+    raise "Already exists: '#{table.name}'." if @list.key?(table.name) && @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)
+    raise "Table not in list: '#{table.name}'." unless @list.key?(table.name)
     @list.delete(table.name)
   end
 end
-
-class Baza::Driver::Mysql::Tables::Table
-  attr_reader :list, :name
-
-  def initialize(args)
-    @args = args
-    @db = args[:db]
-    @data = args[:data]
-    @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
-
-  def reload
-    @data = @db.q("SHOW TABLE STATUS WHERE `Name` = '#{@db.esc(self.name)}'").fetch
-  end
-
-  #Used to validate in Knj::Wrap_map.
-  def __object_unique_id__
-    return @data[:Name]
-  end
-
-  def drop
-    raise "Cant drop native table: '#{self.name}'." if self.native?
-    @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.
-  def native?
-    return true if @db.q("SELECT DATABASE() AS db").fetch[:db] == "mysql"
-    return false
-  end
-
-  def optimize
-    @db.query("OPTIMIZE TABLE `#{@db.esc_table(self.name)}`")
-    return self
-  end
-
-  def rows_count
-    return @db.q("SELECT COUNT(*) AS count FROM `#{@db.esc_table(self.name)}`").fetch[:count].to_i
-  end
-
-  def column(name)
-    name = name.to_sym
-
-    if col = @list.get!(name)
-      return @list[name]
-    end
-
-    self.columns(:name => name) do |col|
-      return col if col.name == name
-    end
-
-    raise Errno::ENOENT, "Column not found: '#{name}'."
-  end
-
-  def columns(args = nil)
-    @db.cols
-    ret = {}
-    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|
-      name = d_cols[:Field].to_sym
-      obj = @list.get!(name)
-
-      if !obj
-        obj = Baza::Driver::Mysql::Columns::Column.new(
-          :table_name => self.name,
-          :db => @db,
-          :data => d_cols
-        )
-        @list[name] = obj
-      end
-
-      if block_given?
-        yield(obj)
-      else
-        ret[name] = obj
-      end
-    end
-
-    if block_given?
-      return nil
-    else
-      return ret
-    end
-  end
-
-  def indexes args = nil
-    @db.indexes
-    ret = {}
-
-    sql = "SHOW INDEX FROM `#{@db.esc_table(name)}`"
-    sql << " WHERE `Key_name` = '#{@db.esc(args[:name])}'" if args && args.key?(:name)
-
-    @db.q(sql) do |d_indexes|
-      next if d_indexes[:Key_name] == "PRIMARY"
-      obj = @indexes_list.get!(d_indexes[:Key_name].to_s)
-
-      unless obj
-        obj = Baza::Driver::Mysql::Indexes::Index.new(
-          table_name: name,
-          db: @db,
-          data: d_indexes
-        )
-        obj.columns << d_indexes[:Column_name]
-        @indexes_list[d_indexes[:Key_name].to_s] = obj
-      end
-
-      if block_given?
-        yield obj
-      else
-        ret[d_indexes[:Key_name].to_s] = obj
-      end
-    end
-
-    if block_given?
-      return nil
-    else
-      return ret
-    end
-  end
-
-  def index(name)
-    name = name.to_s
-
-    if index = @indexes_list.get!(name)
-      return index
-    end
-
-    self.indexes(:name => name) do |index|
-      return index if index.name.to_s == name
-    end
-
-    raise Errno::ENOENT, "Index not found: #{name}."
-  end
-
-  def create_columns(col_arr)
-    @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
-
-  def create_indexes(index_arr, args = {})
-    return Baza::Driver::Mysql::Tables::Table.create_indexes(index_arr, args.merge(:table_name => self.name, :db => @db))
-  end
-
-  def self.create_indexes(index_arr, args = {})
-    db = args[:db]
-
-    if args[:return_sql]
-      sql = ""
-      first = true
-    end
-
-    index_arr.each do |index_data|
-      if !args[:return_sql]
-        sql = ""
-      end
-
-      if args[:create] or !args.key?(:create)
-        sql << "CREATE"
-      end
-
-      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: '#{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
-          first = false
-        else
-          sql << ", "
-        end
-      end
-
-      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])}`"
-      end
-
-      sql << " ("
-
-      first = true
-      index_data[:columns].each do |col_name|
-        sql << ", " if !first
-        first = false if first
-
-        sql << "`#{db.esc_col(col_name)}`"
-      end
-
-      sql << ")"
-
-      if !args[:return_sql]
-        db.query(sql)
-      end
-    end
-
-    if args[:return_sql]
-      return sql
-    else
-      return nil
-    end
-  end
-
-  def rename(newname)
-    newname = newname.to_sym
-    oldname = self.name
-
-    @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)
-
-    @list.each do |name, column|
-      column.instance_variable_set(:@name, newname)
-      column.args[:Field] = newname
-    end
-
-    @indexes_list.each do |name, index|
-      index.args[:table_name] = newname
-    end
-  end
-
-  def truncate
-    @db.query("TRUNCATE `#{@db.esc_table(self.name)}`")
-    return self
-  end
-
-  def data
-    ret = {
-      :name => self.name,
-      :columns => [],
-      :indexes => []
-    }
-
-    columns.each do |name, column|
-      ret[:columns] << column.data
-    end
-
-    indexes.each do |name, index|
-      ret[:indexes] << index.data if name != "PRIMARY"
-    end
-
-    return ret
-  end
-
-  def insert(data)
-    @db.insert(self.name, data)
-  end
-
-  def clone(newname, args = {})
-    raise "Invalid name." if newname.to_s.strip.empty?
-
-    sql = "CREATE TABLE `#{@db.esc_table(newname)}` ("
-    first = true
-    pkey_found = false
-    pkeys = []
-
-    columns do |col|
-      sql << ", " if !first
-      first = false if first
-
-      col_data = col.data
-      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
-      end
-
-      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]
-      end
-
-      sql << @db.cols.data_sql(col_data)
-    end
-
-    unless pkeys.empty?
-      sql << ", PRIMARY KEY ("
-
-      first = true
-      pkeys.each do |pkey|
-        sql << ", " if !first
-        first = false if first
-        sql << "`#{@db.esc_col(pkey)}`"
-      end
-
-      sql << ")"
-    end
-
-    sql << ")"
-    sql << " TABLESPACE #{args[:tablespace]}" if args[:tablespace]
-    sql << " ENGINE=#{args[:engine]}" if args[:engine]
-    sql << ";"
-
-    #Create table.
-    @db.query(sql)
-
-
-    #Insert data of previous data in a single query.
-    @db.query("INSERT INTO `#{@db.esc_table(newname)}` SELECT * FROM `#{@db.esc_table(self.name)}`")
-
-
-    #Create indexes.
-    new_table = @db.tables[newname]
-    indexes_list = []
-    indexes do |index|
-      indexes_list << index.data unless index.primary?
-    end
-
-    new_table.create_indexes(indexes_list)
-
-
-    #Return new 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/libknjdb_java_sqlite3.rb

@@ -2,30 +2,30 @@ class KnjDB_java_sqlite3
   def escape_table
     return "`"
   end
-  
+
   def escape_col
     return "`"
   end
-  
+
   def escape_val
     return "'"
   end
-  
+
   def initialize(baza_db_obj)
     @baza_db = baza_db_obj
-    
+
     if @baza_db.opts[:sqlite_driver]
       require @baza_db.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:" + @baza_db.opts[:path])
     @stat = @conn.createStatement
   end
-  
+
   def query(string)
     begin
       return KnjDB_java_sqlite3_result.new(@stat.executeQuery(string))
@@ -37,21 +37,18 @@ class KnjDB_java_sqlite3
       end
     end
   end
-  
+
   def fetch(result)
     return result.fetch
   end
-  
+
   def escape(string)
-    if (!string)
-      return ""
-    end
-    
-      string = string.gsub("'", "\\'")
+    return "" unless string
+    string = string.gsub("'", "\\'")
     return string
   end
-  
-  def lastID
+
+  def last_id
     return @conn.last_insert_row_id
   end
 end
@@ -60,24 +57,22 @@ class KnjDB_java_sqlite3_result
   def initialize(rs)
     @rs = rs
     @index = 0
-    
+
     if rs
       @metadata = rs.getMetaData
       @columns_count = @metadata.getColumnCount
     end
   end
-  
+
   def fetch
-    if !@rs.next
-      return false
-    end
-    
+    return false unless @rs.next
+
     tha_return = {}
     for i in (1..@columns_count)
       col_name = @metadata.getColumnName(i)
       tha_return.store(col_name, @rs.getString(i))
     end
-    
+
     return tha_return
   end
 end

data/include/drivers/sqlite3/libknjdb_sqlite3_ironruby.rb

@@ -5,38 +5,38 @@ class Baza::Driver::Sqlite3_ironruby
   def escape_table
     return "`"
   end
-  
+
   def escape_col
     return "`"
   end
-  
+
   def escape_val
     return "'"
   end
-  
+
   def initialize(baza_db_obj)
     @baza_db = baza_db_obj
     @conn = Mono::Data::SqliteClient::SqliteConnection.new("URI=file:" + @baza_db.opts[:path] + ",version=3")
     @conn.Open
   end
-  
+
   def query(string)
     dbcmd = @conn.CreateCommand
     dbcmd.CommandText = string
     reader = dbcmd.ExecuteReader
     return Baza::Driver::Sqlite3_ironruby_result.new(reader)
   end
-  
+
   def escape(string)
     if (!string)
       return ""
     end
-    
+
       string = string.gsub("'", "\\'")
     return string
   end
-  
-  def lastID
+
+  def last_id
     return @conn.last_insert_row_id
   end
 end
@@ -45,14 +45,14 @@ class Baza::Driver::Sqlite3_ironruby_result
   def initialize(reader)
     @reader = reader
   end
-  
+
   def fetch
     if !@reader.Read
       return false
     end
-    
+
     ret = {}
-    
+
     count = 0
     while true
       begin
@@ -60,10 +60,10 @@ class Baza::Driver::Sqlite3_ironruby_result
       rescue IndexError => e
         break
       end
-      
+
       count += 1
     end
-    
+
     return ret
   end
 end