baza 0.0.19 → 0.0.20

data/lib/baza/drivers/mysql_java.rb

@@ -1,6 +1,10 @@
+Baza.load_driver("mysql")
+
 class Baza::Driver::MysqlJava < Baza::JdbcDriver
   path = "#{File.dirname(__FILE__)}/mysql_java"
 
+  autoload :Database, "#{path}/database"
+  autoload :Databases, "#{path}/databases"
   autoload :Table, "#{path}/table"
   autoload :Tables, "#{path}/tables"
   autoload :Column, "#{path}/column"
@@ -13,7 +17,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
 
   attr_reader :conn, :conns
 
-  #Helper to enable automatic registering of database using Baza::Db.from_object
+  # Helper to enable automatic registering of database using Baza::Db.from_object
   def self.from_object(args)
     if args[:object].class.name == "Java::ComMysqlJdbc::JDBC4Connection"
       return {
@@ -25,7 +29,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
       }
     end
 
-    return nil
+    nil
   end
 
   def initialize(baza)
@@ -36,7 +40,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     if @opts[:encoding]
       @encoding = @opts[:encoding]
     else
-      @encoding = 'utf8'
+      @encoding = "utf8"
     end
 
     if @baza.opts.key?(:port)
@@ -49,7 +53,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     reconnect
   end
 
-  #Respawns the connection to the MySQL-database.
+  # Respawns the connection to the MySQL-database.
   def reconnect
     @mutex.synchronize do
       if @baza.opts[:conn]
@@ -61,23 +65,23 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
       end
 
       query_no_result_set("SET SQL_MODE = ''")
-      query_no_result_set("SET NAMES '#{self.esc(@encoding)}'") if @encoding
+      query_no_result_set("SET NAMES '#{esc(@encoding)}'") if @encoding
     end
   end
 
-  #Returns the last inserted ID for the connection.
+  # Returns the last inserted ID for the connection.
   def last_id
     data = query("SELECT LAST_INSERT_ID() AS id").fetch
     return data[:id].to_i if data[:id]
     raise "Could not figure out last inserted ID."
   end
 
-  #Closes the connection threadsafe.
+  # Closes the connection threadsafe.
   def close
     @mutex.synchronize { @conn.close }
   end
 
-  #Destroyes the connection.
+  # Destroyes the connection.
   def destroy
     @conn = nil
     @baza = nil
@@ -87,7 +91,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     @port = nil
   end
 
-  #Inserts multiple rows in a table. Can return the inserted IDs if asked to in arguments.
+  # Inserts multiple rows in a table. Can return the inserted IDs if asked to in arguments.
   def insert_multi(tablename, arr_hashes, args = nil)
     sql = "INSERT INTO `#{tablename}` ("
 
@@ -103,7 +107,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     keys.each do |col_name|
       sql << "," unless first
       first = false if first
-      sql << "`#{self.esc_col(col_name)}`"
+      sql << "`#{escape_column(col_name)}`"
     end
 
     sql << ") VALUES ("
@@ -128,7 +132,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
           sql << @baza.sqlval(val)
         end
       else
-        hash.each do |key, val|
+        hash.each do |_key, val|
           if first_key
             first_key = false
           else
@@ -147,7 +151,7 @@ class Baza::Driver::MysqlJava < Baza::JdbcDriver
     query_no_result_set(sql)
 
     if args && args[:return_id]
-      first_id = self.last_id
+      first_id = last_id
       raise "Invalid ID: #{first_id}" if first_id.to_i <= 0
       ids = [first_id]
       1.upto(arr_hashes.length - 1) do |count|

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

@@ -1,30 +1,30 @@
-#This class handels all the SQLite3-columns.
+# This class handels all the SQLite3-columns.
 class Baza::Driver::Sqlite3::Column < Baza::Column
   attr_reader :args
 
-  #Constructor. This should not be called manually.
+  # Constructor. This should not be called manually.
   def initialize(args)
     @args = args
     @db = @args[:db]
   end
 
-  #Returns the name of the column.
+  # Returns the name of the column.
   def name
-    return @args[:data][:name].to_sym
+    @args[:data][:name]
   end
 
   def table_name
     @args[:table_name]
   end
 
-  #Returns the columns table-object.
+  # Returns the columns table-object.
   def table
-    return @db.tables[table_name]
+    @db.tables[table_name]
   end
 
-  #Returns the data of the column as a hash in knjdb-format.
+  # Returns the data of the column as a hash in knjdb-format.
   def data
-    return {
+    {
       type: type,
       name: name,
       null: null?,
@@ -35,9 +35,9 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
     }
   end
 
-  #Returns the type of the column.
+  # Returns the type of the column.
   def type
-    if !@type
+    unless @type
       if match = @args[:data][:type].match(/^([A-z]+)$/)
         @maxlength = false
         type = match[0].to_sym
@@ -50,8 +50,8 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
       elsif match = @args[:data][:type].match(/^(.+)\((\d+)\)$/)
         @maxlength = match[2]
         type = match[1].to_sym
-      elsif @args[:data].key?(:type) and @args[:data][:type].to_s == ""
-        #A type can actually be empty in SQLite... Wtf?
+      elsif @args[:data].key?(:type) && @args[:data][:type].to_s == ""
+        # A type can actually be empty in SQLite... Wtf?
         return @args[:data][:type]
       end
 
@@ -64,23 +64,23 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
       raise "Still not type? (#{@args[:data]})" if @type.to_s.strip.empty?
     end
 
-    return @type
+    @type
   end
 
-  #Returns true if the column allows null. Otherwise false.
+  # Returns true if the column allows null. Otherwise false.
   def null?
     return false if @args[:data][:notnull].to_i == 1
-    return true
+    true
   end
 
-  #Returns the maxlength of the column.
+  # Returns the maxlength of the column.
   def maxlength
-    self.type if !@maxlength
+    type unless @maxlength
     return @maxlength if @maxlength
-    return false
+    false
   end
 
-  #Returns the default value of the column.
+  # Returns the default value of the column.
   def default
     def_val = @args[:data][:dflt_value]
 
@@ -89,38 +89,38 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
     end
 
     return false if @args[:data][:dflt_value].to_s.empty?
-    return def_val
+    def_val
   end
 
-  #Returns true if the column is the primary key.
+  # Returns true if the column is the primary key.
   def primarykey?
     return false if @args[:data][:pk].to_i == 0
-    return true
+    true
   end
 
-  #Returns true if the column is auto-increasing.
+  # Returns true if the column is auto-increasing.
   def autoincr?
-    return true if @args[:data][:pk].to_i == 1 && @args[:data][:type].to_sym == :integer
-    return false
+    return true if @args[:data][:pk].to_i == 1 && @args[:data][:type].to_s == "integer"
+    false
   end
 
-  #Drops the column from the table.
+  # Drops the column from the table.
   def drop
     table.copy(drops: name)
   end
 
   def reload
-    @db.q("PRAGMA table_info(`#{@db.esc_table(table_name)}`)") do |data|
-      next unless data[:name] == @args[:data][:name]
+    @db.q("PRAGMA table_info(`#{@db.escape_table(table_name)}`)") do |data|
+      next unless data.fetch(:name) == name
       @args[:data] = data
       @type = nil
-      return
+      return nil
     end
 
-    raise "Could not find data for column: #{table_name}.#{name}"
+    raise Baza::Errors::ColumnNotFound, "Could not find data for column: #{table_name}.#{name}"
   end
 
-  #Changes data on the column. Like the name, type, maxlength or whatever.
+  # Changes data on the column. Like the name, type, maxlength or whatever.
   def change(data)
     newdata = data.clone
 
@@ -136,11 +136,11 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
 
     new_table = table.copy(
       alter_columns: {
-        name.to_sym => newdata
+        name => newdata
       }
     )
 
-    @args[:data][:name] = newdata[:name].to_s
+    @args[:data][:name] = newdata.fetch(:name).to_s
     reload
   end
 end

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

@@ -1,16 +1,16 @@
-#This class handels the SQLite3-specific behaviour for columns.
+# This class handels the SQLite3-specific behaviour for columns.
 class Baza::Driver::Sqlite3::Columns
   attr_reader :db
 
-  #Constructor. This should not be called manually.
+  # Constructor. This should not be called manually.
   def initialize(args)
     @args = args
   end
 
   DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after, :renames]
-  #Returns SQL for a knjdb-compatible hash.
+  # Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
-    data.each do |key, val|
+    data.each_key do |key|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
     end
 
@@ -33,7 +33,7 @@ class Baza::Driver::Sqlite3::Columns
 
     if !data[:null] && data.key?(:null)
       sql << " NOT NULL"
-      data[:default] = 0 if type == :int if !data.key?(:default) || !data[:default]
+      data[:default] = 0 if !data.key?(:default) || !data[:default] && type == :int
     end
 
     if data.key?(:default_func)
@@ -42,6 +42,6 @@ class Baza::Driver::Sqlite3::Columns
       sql << " DEFAULT '#{@args[:db].escape(data[:default])}'"
     end
 
-    return sql
+    sql
   end
 end

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

@@ -0,0 +1,2 @@
+class Baza::Driver::Sqlite3::Database < Baza::Database
+end

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

@@ -0,0 +1,25 @@
+class Baza::Driver::Sqlite3::Databases
+  def initialize(args)
+    @db = args.fetch(:db)
+    raise "Db wasn't a baza object" unless @db.class.name.include?("Baza")
+  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|
+      yielder << Baza::Driver::Sqlite3::Database.new(
+        name: "Main",
+        driver: self,
+        db: @db
+      )
+    end
+  end
+end

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

@@ -3,20 +3,21 @@ class Baza::Driver::Sqlite3::Index < Baza::Index
 
   def initialize(args)
     @args = args
+    @data = args.delete(:data)
     @columns = []
     @db = args[:db]
   end
 
   def name
-    return @args[:data][:name]
+    @data.fetch(:name)
   end
 
   def table_name
-    return @args[:table_name]
+    @args.fetch(:table_name)
   end
 
   def table
-    return @db.tables[table_name]
+    @db.tables[table_name]
   end
 
   def drop
@@ -31,11 +32,11 @@ class Baza::Driver::Sqlite3::Index < Baza::Index
 
     drop
     table.create_indexes([create_args])
-    @args[:data][:name] = newname
+    @data[:name] = newname
   end
 
   def data
-    return {
+    {
       name: name,
       unique: unique?,
       columns: @columns
@@ -47,6 +48,19 @@ class Baza::Driver::Sqlite3::Index < Baza::Index
   end
 
   def unique?
-    @args[:data][:unique].to_i == 1
+    @data.fetch(:unique).to_i == 1
+  end
+
+  def reload
+    data = nil
+    @db.query("PRAGMA index_list(`#{@db.escape_table(name)}`)") do |d_indexes|
+      next unless d_indexes.fetch(:name) == name
+      data = d_indexes
+      break
+    end
+
+    raise Baza::Errors::IndexNotFound unless data
+    @data = data
+    self
   end
 end

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

@@ -8,7 +8,7 @@ class Baza::Driver::Sqlite3::Result < Baza::ResultBase
       @statement.execute
       @type_translation = driver.baza.opts[:type_translation]
       @types = statement.types if @type_translation == true
-      @columns = statement.columns.map { |column| column.to_sym }
+      @columns = statement.columns.map(&:to_sym)
       read_results
       @index = -1
     ensure
@@ -19,16 +19,15 @@ class Baza::Driver::Sqlite3::Result < Baza::ResultBase
   # Returns a single result.
   def fetch
     row = @results[@index += 1]
+    return unless row
 
-    if row
-      if @types
-        row.map!.with_index { |value, index| translate_type(value, @types[index]) } if @types
-      elsif @type_translation == :string
-        row.map! { |value| value.to_s }
-      end
-
-      return Hash[*@columns.zip(row).flatten]
+    if @types
+      row.map!.with_index { |value, index| translate_type(value, @types[index]) } if @types
+    elsif @type_translation == :string
+      row.map!(&:to_s)
     end
+
+    Hash[*@columns.zip(row).flatten]
   end
 
   # Loops over every result yielding them.
@@ -51,14 +50,14 @@ private
   end
 
   def translate_type(value, type)
-    if value
-      if type == 'datetime'
-        return Time.parse(value)
-      elsif type == 'date'
-        return Date.parse(value)
-      else
-        return value
-      end
+    return unless value
+
+    if type == "datetime"
+      Time.parse(value)
+    elsif type == "date"
+      Date.parse(value)
+    else
+      value
     end
   end
 end

data/lib/baza/drivers/sqlite3/sqlspecs.rb

@@ -1,5 +1,5 @@
 class Baza::Driver::Sqlite3::Sqlspecs < Baza::Sqlspecs
   def strftime(val, col_str)
-    return "STRFTIME('#{val}', SUBSTR(#{col_str}, 0, 20))"
+    "STRFTIME('#{val}', SUBSTR(#{col_str}, 0, 20))"
   end
 end