baza 0.0.19 → 0.0.20

data/lib/baza/dbtime.rb

@@ -1,35 +1,35 @@
-#This class helps handeling time-columns in databases.
+# This class helps handeling time-columns in databases.
 class Baza::Dbtime
-  #These variables return information about the object.
+  # These variables return information about the object.
   attr_reader :hours, :mins, :secs, :total_secs
-  
-  #Initializes the object from arguments useually given by Baza::Datarow.
+
+  # Initializes the object from arguments useually given by Baza::Datarow.
   def initialize(args)
-    args = {:time => args} if args.is_a?(String)
-    
-    raise "Invalid arguments given: #{args}" if !args.is_a?(Hash)
-    raise "No time given." if !args[:time]
-    raise "Invalid time given: #{args[:time].class.name}" if !args[:time].is_a?(String)
-    
+    args = {time: args} if args.is_a?(String)
+
+    raise "Invalid arguments given: #{args}" unless args.is_a?(Hash)
+    raise "No time given." unless args[:time]
+    raise "Invalid time given: #{args[:time].class.name}" unless args[:time].is_a?(String)
+
     match = args[:time].match(/^(\d+):(\d+):(\d+)$/)
-    raise "Could not understand time format." if !match
-    
+    raise "Could not understand time format." unless match
+
     @hours = match[1].to_i
     @mins = match[2].to_i
     @secs = match[3].to_i
-    
+
     @total_secs = @hours * 3600
     @total_secs += @mins * 60
     @total_secs += @secs
   end
-  
-  #Returns the total amount of hours.
+
+  # Returns the total amount of hours.
   def hours_total
-    return (@total_secs.to_f / 3600)
+    (@total_secs.to_f / 3600)
   end
-  
-  #Return the total amount of minutes.
+
+  # Return the total amount of minutes.
   def mins_total
-    return (@total_secs.to_f / 60)
+    (@total_secs.to_f / 60)
   end
-end
+end

data/lib/baza/driver.rb

@@ -1,9 +1,9 @@
-#Subclass that contains all the drivers as further subclasses.
+# Subclass that contains all the drivers as further subclasses.
 class Baza::Driver
-  #Autoloader for drivers.
+  # Autoloader for drivers.
   def self.const_missing(name)
     require_relative "drivers/#{StringCases.camel_to_snake(name)}.rb"
     raise LoadError, "Still not loaded: '#{name}'." unless Baza::Driver.const_defined?(name)
-    return Baza::Driver.const_get(name)
+    Baza::Driver.const_get(name)
   end
 end

data/lib/baza/drivers/active_record/columns.rb

@@ -1,7 +1,7 @@
 class Baza::Driver::ActiveRecord::Columns
   def initialize(args)
     @args = args
-    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].conn.conn_type)).const_get(:Columns).new(@args)
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].driver.driver_type)).const_get(:Columns).new(@args)
   end
 
   def method_missing(name, *args, &blk)

data/lib/baza/drivers/active_record/indexes.rb

@@ -1,7 +1,7 @@
 class Baza::Driver::ActiveRecord::Indexes
   def initialize(args)
     @args = args
-    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].conn.conn_type)).const_get(:Indexes).new(@args)
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].driver.driver_type)).const_get(:Indexes).new(@args)
   end
 
   def method_missing(name, *args, &blk)

data/lib/baza/drivers/active_record/result.rb

@@ -5,11 +5,9 @@ class Baza::Driver::ActiveRecord::Result < Baza::ResultBase
   end
 
   def fetch
-    begin
-      return to_enum.next
-    rescue StopIteration
-      return false
-    end
+    return to_enum.next
+  rescue StopIteration
+    return false
   end
 
   def each

data/lib/baza/drivers/active_record/tables.rb

@@ -2,8 +2,8 @@ class Baza::Driver::ActiveRecord::Tables
   def initialize(args)
     @args = args
 
-    require "#{File.dirname(__FILE__)}/../#{@args[:db].conn.conn_type}"
-    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].conn.conn_type)).const_get(:Tables).new(@args)
+    require "#{File.dirname(__FILE__)}/../#{@args.fetch(:db).driver.driver_type}"
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args.fetch(:db).driver.driver_type)).const_get(:Tables).new(@args)
   end
 
   def method_missing(name, *args, &blk)

data/lib/baza/drivers/active_record.rb

@@ -1,4 +1,4 @@
-class Baza::Driver::ActiveRecord
+class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
   path = "#{File.dirname(__FILE__)}/active_record"
 
   autoload :Tables, "#{path}/tables"
@@ -6,7 +6,7 @@ class Baza::Driver::ActiveRecord
   autoload :Indexes, "#{path}/indexes"
   autoload :Result, "#{path}/result"
 
-  attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val, :symbolize, :conn_type
+  attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val, :symbolize, :driver_type
   attr_accessor :tables, :cols, :indexes
 
   def self.from_object(args)
@@ -26,38 +26,48 @@ class Baza::Driver::ActiveRecord
       }
     end
 
-    return nil
+    nil
   end
 
   def initialize(baza)
     @baza = baza
-    @conn = @baza.opts[:conn]
+    @conn = @baza.opts.fetch(:conn)
 
-    raise 'No conn given' unless @conn
+    raise "No conn given" unless @conn
 
     conn_name = @conn.class.name.to_s.downcase
 
     if conn_name.include?("mysql2")
+      require_relative "mysql2"
+      require_relative "mysql2/result"
+
       @sep_table = "`"
       @sep_col = "`"
       @sep_val = "'"
-      @conn_type = :mysql2
+      @driver_type = :mysql2
       @result_constant = Baza::Driver::Mysql2::Result
     elsif conn_name.include?("mysql")
+      require_relative "mysql"
+      require_relative "mysql/result"
+
       @sep_table = "`"
       @sep_col = "`"
       @sep_val = "'"
-      @conn_type = :mysql
-      @result_constant = Baza::Driver::Mysql::Result unless RUBY_PLATFORM == 'java'
+      @driver_type = :mysql
+      @result_constant = Baza::Driver::Mysql::Result unless RUBY_PLATFORM == "java"
     elsif conn_name.include?("sqlite")
       @sep_table = "`"
       @sep_col = "`"
       @sep_val = "'"
-      @conn_type = :sqlite3
+      @driver_type = :sqlite3
     else
       raise "Unknown type: '#{conn_name}'."
     end
 
+    if conn_name.include?("mysql")
+      @baza.opts[:db] ||= query("SELECT DATABASE()").fetch.fetch(:"DATABASE()")
+    end
+
     @result_constant ||= Baza::Driver::ActiveRecord::Result
   end
 
@@ -65,22 +75,22 @@ class Baza::Driver::ActiveRecord
     @result_constant.new(self, @conn.execute(sql))
   end
 
-  alias query_ubuf query
+  alias_method :query_ubuf, :query
 
   def escape(str)
     @conn.quote_string(str.to_s)
   end
 
-  def esc_col(string)
+  def escape_column(string)
     string = string.to_s
     raise "Invalid column-string: #{string}" if string.include?(@sep_col)
-    return string
+    string
   end
 
-  def esc_table(string)
+  def escape_table(string)
     string = string.to_s
     raise "Invalid column-string: #{string}" if string.include?(@sep_col)
-    return string
+    string
   end
 
   def close
@@ -88,9 +98,9 @@ class Baza::Driver::ActiveRecord
   end
 
   def transaction
-    if @conn_type == :mysql || @conn_type == :mysql2
+    if @driver_type == :mysql || @driver_type == :mysql2
       query("START TRANSACTION")
-    elsif @conn_type == :sqlite3
+    elsif @driver_type == :sqlite3
       query("BEGIN TRANSACTION")
     else
       raise "Don't know how to start transaction"
@@ -104,4 +114,8 @@ class Baza::Driver::ActiveRecord
       raise
     end
   end
+
+  def supports_multiple_databases?
+    conn_name.include?("mysql")
+  end
 end

data/lib/baza/drivers/mysql/column.rb

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

data/lib/baza/drivers/mysql/columns.rb

@@ -1,15 +1,15 @@
-#This class handels various MySQL-column-specific operations.
+# This class handels various MySQL-column-specific operations.
 class Baza::Driver::Mysql::Columns
-  #Constructor. Should not be called manually.
+  # Constructor. Should not be called manually.
   def initialize(args)
     @args = args
   end
 
-  #Returns the SQL for this column.
+  # Returns the SQL for this column.
   DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames]
   def data_sql(data)
-    data.each do |key, val|
-      raise "Invalid key: '#{key}' (#{key.class.name})." if !DATA_SQL_ALLOWED_KEYS.include?(key)
+    data.each_key do |key|
+      raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
     end
 
     raise "No type given." unless data[:type]
@@ -21,7 +21,7 @@ class Baza::Driver::Mysql::Columns
     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 << " NOT NULL" unless data[:null]
 
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
@@ -30,10 +30,10 @@ class Baza::Driver::Mysql::Columns
     end
 
     sql << " COMMENT '#{@args[:db].escape(data[:comment])}'" if data.key?(:comment)
-    sql << " AFTER `#{@args[:db].esc_col(data[:after])}`" if data[:after] && !data[:first]
+    sql << " AFTER `#{@args[:db].escape_column(data[:after])}`" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]
 
-    return sql
+    sql
   end
 end

data/lib/baza/drivers/mysql/database.rb

@@ -0,0 +1,28 @@
+class Baza::Driver::Mysql::Database < Baza::Database
+  def save!
+    rename(name) unless name.to_s == name_was
+    self
+  end
+
+  def drop
+    sql = "DROP DATABASE `#{@db.escape_database(name)}`"
+    @db.query(sql)
+    self
+  end
+
+private
+
+  def rename(new_name)
+    new_name = new_name.to_s
+    @db.databases.create(name: new_name)
+
+    tables.each do |table|
+      @db.query("ALTER TABLE `#{@db.escape_database(name_was)}`.`#{@db.escape_table(table.name)}` RENAME `#{@db.escape_database(name)}`.`#{@db.escape_table(table.name)}`")
+    end
+
+    @db.query("DROP DATABASE `#{@db.escape_database(name_was)}`")
+
+    @name = new_name
+    @name_was = new_name
+  end
+end

data/lib/baza/drivers/mysql/databases.rb

@@ -0,0 +1,35 @@
+class Baza::Driver::Mysql::Databases
+  def initialize(args)
+    @db = args.fetch(:db)
+  end
+
+  def create(args)
+    sql = "CREATE DATABASE"
+    sql << " IF NOT EXISTS" if args[:if_not_exists]
+    sql << " `#{@db.escape_table(args.fetch(:name))}`"
+
+    @db.query(sql)
+    true
+  end
+
+  def [](name)
+    name = name.to_s
+    list.each do |database|
+      return database if database.name == name
+    end
+
+    raise Baza::Errors::DatabaseNotFound
+  end
+
+  def list
+    ArrayEnumerator.new do |yielder|
+      @db.query("SHOW DATABASES") do |data|
+        yielder << Baza::Driver::Mysql::Database.new(
+          name: data.fetch(:Database),
+          driver: self,
+          db: @db
+        )
+      end
+    end
+  end
+end

data/lib/baza/drivers/mysql/index.rb

@@ -1,68 +1,78 @@
 class Baza::Driver::Mysql::Index < Baza::Index
   attr_reader :args, :columns
+  attr_accessor :table_name
 
   def initialize(args)
-    @args = args
+    @db = args.fetch(:db)
+    @data = args.fetch(:data)
+    @table_name = args.fetch(:table_name)
     @columns = []
   end
 
-  #Used to validate in Wref::Map.
+  # Used to validate in Wref::Map.
   def __object_unique_id__
-    return @args[:data][:Key_name]
+    name
   end
 
   def name
-    return @args[:data][:Key_name]
+    @data.fetch(:Key_name)
   end
 
   def table
-    return @args[:db].tables[@args[:table_name]]
+    @db.tables[@table_name]
   end
 
   def drop
-    sql = "DROP INDEX `#{self.name}` ON `#{self.table.name}`"
+    sql = "DROP INDEX `#{name}` ON `#{@table_name}`"
 
     begin
-      @args[:db].query(sql)
+      @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
+      # The index has already been dropped - ignore.
+      raise e if e.message.index("check that column/key exists") == nil
     end
+
+    self
   end
 
-  def rename newname
-    newname = newname.to_sym
+  def rename(newname)
+    newname = newname.to_s
     create_args = data
     create_args[:name] = newname
 
     drop
     table.create_indexes([create_args])
-    @args[:data][:Key_name] = newname
+    @data[:Key_name] = newname
+
+    self
   end
 
   def data
-    return {
+    {
       name: name,
       columns: @columns
     }
   end
 
-  #Returns true if the index is a unique-index.
+  # Returns true if the index is a unique-index.
   def unique?
-    if @args[:data][:Index_type] == "UNIQUE" || @args[:data][:Non_unique].to_i == 0
+    if @data.fetch(:Index_type) == "UNIQUE" || @data.fetch(:Non_unique).to_i == 0
       return true
     else
       return false
     end
   end
 
-  #Returns true if the index is a primary-index.
+  # Returns true if the index is a primary-index.
   def primary?
-    return true if @args[:data][:Key_name] == "PRIMARY"
-    return false
+    return true if @data.fetch(:Key_name) == "PRIMARY"
+    false
+  end
+
+  def reload
+    data = @db.query("SHOW INDEX FROM `#{@db.escape_table(@table_name)}` WHERE `Key_name` = '#{@db.esc(name)}'").fetch
+    raise Baza::Errors::IndexNotFound unless data
+    @data = data
+    self
   end
 end