baza 0.0.13 → 0.0.14

data/include/dbtime.rb

@@ -7,9 +7,9 @@ class Baza::Dbtime
   def initialize(args)
     args = {:time => args} if args.is_a?(String)
     
-    raise "Invalid arguments given." if !args.is_a?(Hash)
+    raise "Invalid arguments given: #{args}" if !args.is_a?(Hash)
     raise "No time given." if !args[:time]
-    raise "Invalid time given." if !args[:time].is_a?(String)
+    raise "Invalid time given: #{args[:time].class.name}" if !args[:time].is_a?(String)
     
     match = args[:time].match(/^(\d+):(\d+):(\d+)$/)
     raise "Could not understand time format." if !match

data/include/driver.rb

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

data/include/drivers/active_record/active_record.rb

@@ -1,26 +1,32 @@
 class Baza::Driver::ActiveRecord
   attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val, :symbolize, :conn_type
   attr_accessor :tables, :cols, :indexes
-  
+
   def self.from_object(args)
     if args[:object].class.name.include?("ActiveRecord::ConnectionAdapters")
+      if args[:object].class.name.include?("ConnectionPool")
+        object_to_use = args[:object].connection
+      else
+        object_to_use = args[:object]
+      end
+
       return {
-        :type => :success,
-        :args => {
-          :type => :active_record,
-          :conn => args[:object]
+        type: :success,
+        args: {
+          type: :active_record,
+          conn: object_to_use
         }
       }
     end
-    
+
     return nil
   end
-  
+
   def initialize(baza)
     @baza = baza
     @conn = @baza.opts[:conn]
     conn_name = @conn.class.name.to_s.downcase
-    
+
     if conn_name.include?("mysql")
       @sep_table = "`"
       @sep_col = "`"
@@ -35,51 +41,82 @@ class Baza::Driver::ActiveRecord
       raise "Unknown type: '#{conn_name}'."
     end
   end
-  
+
   def query(str)
-    Baza::Driver::ActiveRecord::Result.new(self, @conn.execute(str))
+    Baza::Driver::ActiveRecord::Result.new(@conn.execute(str))
   end
-  
+
   def escape(str)
     @conn.quote_string(str.to_s)
   end
-  
+
   def esc_col(string)
     string = string.to_s
     raise "Invalid column-string: #{string}" if string.include?(@sep_col)
     return string
   end
-  
+
   def esc_table(string)
     string = string.to_s
     raise "Invalid column-string: #{string}" if string.include?(@sep_col)
     return string
   end
+
+  def close
+    @conn.close
+  end
+
+  def transaction
+    if @conn_type == :mysql
+      query("START TRANSACTION")
+    elsif @conn_type == :sqlite3
+      query("BEGIN TRANSACTION")
+    end
+
+    begin
+      yield @baza
+      query("COMMIT")
+    rescue
+      query("ROLLBACK")
+      raise
+    end
+  end
 end
 
 class Baza::Driver::ActiveRecord::Result
-  def initialize(db, res)
-    @db = db
+  def initialize(res)
     @res = res
   end
-  
-  def each
-    @res.each(:as => :hash) do |hash|
-      yield hash.symbolize_keys!
+
+  def enum
+    @enum ||= Enumerator.new do |y|
+      @res.each(as: :hash) do |result|
+        y << result.symbolize_keys
+      end
     end
-    
-    nil
+  end
+
+  def fetch
+    begin
+      return enum.next
+    rescue StopIteration
+      return false
+    end
+  end
+
+  def each &blk
+    enum.each &blk
   end
 end
 
 class Baza::Driver::ActiveRecord::Tables
   def initialize(args)
     @args = args
-    
+
     require_relative "../#{@args[:db].conn.conn_type}/#{@args[:db].conn.conn_type}_tables"
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].conn.conn_type)).const_get(:Tables).new(@args)
   end
-  
+
   def method_missing(name, *args, &blk)
     @proxy_to.__send__(name, *args, &blk)
   end
@@ -88,11 +125,11 @@ end
 class Baza::Driver::ActiveRecord::Columns
   def initialize(args)
     @args = args
-    
+
     require_relative "../#{@args[:db].conn.conn_type}/#{@args[:db].conn.conn_type}_columns"
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].conn.conn_type)).const_get(:Columns).new(@args)
   end
-  
+
   def method_missing(name, *args, &blk)
     @proxy_to.__send__(name, *args, &blk)
   end
@@ -101,11 +138,11 @@ end
 class Baza::Driver::ActiveRecord::Indexes
   def initialize(args)
     @args = args
-    
+
     require_relative "../#{@args[:db].conn.conn_type}/#{@args[:db].conn.conn_type}_indexes"
     @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].conn.conn_type)).const_get(:Indexes).new(@args)
   end
-  
+
   def method_missing(name, *args, &blk)
     @proxy_to.__send__(name, *args, &blk)
   end

data/include/drivers/mysql/mysql_columns.rb

@@ -4,36 +4,36 @@ class Baza::Driver::Mysql::Columns
   def initialize(args)
     @args = args
   end
-  
+
   #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)
     end
-    
+
     raise "No type given." if !data[:type]
     type = data[:type].to_sym
-    
+
     data[:maxlength] = 255 if type == :varchar and !data.key?(:maxlength)
-    
+
     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])}'"
     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]
-    
+
     return sql
   end
 end
@@ -41,37 +41,37 @@ 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 => self.type,
-      :name => self.name,
-      :null => self.null?,
-      :maxlength => self.maxlength,
-      :default => self.default,
-      :primarykey => self.primarykey?,
-      :autoincr => self.autoincr?
+      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
@@ -88,26 +88,26 @@ class Baza::Driver::Mysql::Columns::Column
         @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
@@ -115,48 +115,48 @@ class Baza::Driver::Mysql::Columns::Column
     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
+end

data/include/drivers/mysql/mysql_indexes.rb

@@ -5,29 +5,29 @@ class Baza::Driver::Mysql::Indexes
 end
 
 class Baza::Driver::Mysql::Indexes::Index
-  attr_reader :columns
-  
+  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
@@ -39,14 +39,24 @@ class Baza::Driver::Mysql::Indexes::Index
       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
+      name: name,
+      columns: @columns
     }
   end
-  
+
   #Returns true if the index is a unique-index.
   def unique?
     if @args[:data][:Index_type] == "UNIQUE"
@@ -55,15 +65,14 @@ class Baza::Driver::Mysql::Indexes::Index
       return false
     end
   end
-  
+
   #Returns true if the index is a primary-index.
   def primary?
-		return true if @args[:data][:Index_type] == "BTREE"
-		return false
+    return true if @args[:data][:Key_name] == "PRIMARY"
+    return false
   end
-  
-  #Inspect crashes if this is not present? - knj.
+
   def to_s
-    return "#<#{self.class.name}>"
+    return "#<Baza::Driver::Mysql::Index name: \"#{name}\", columns: #{@columns}, primary: #{primary?}, unique: #{unique?}>"
   end
 end