baza 0.0.19 → 0.0.20

data/lib/baza/drivers/sqlite3_java.rb

@@ -1,7 +1,9 @@
-#This class handels SQLite3-specific behaviour.
+# This class handels SQLite3-specific behaviour.
 class Baza::Driver::Sqlite3Java < Baza::JdbcDriver
   path = "#{File.dirname(__FILE__)}/sqlite3_java"
 
+  autoload :Database, "#{path}/database"
+  autoload :Databases, "#{path}/databases"
   autoload :Table, "#{path}/table"
   autoload :Tables, "#{path}/tables"
   autoload :Column, "#{path}/column"
@@ -14,7 +16,7 @@ class Baza::Driver::Sqlite3Java < Baza::JdbcDriver
 
   attr_reader :mutex_statement_reader
 
-  #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::OrgSqlite::SQLiteConnection"
       return {
@@ -27,7 +29,7 @@ class Baza::Driver::Sqlite3Java < Baza::JdbcDriver
     end
   end
 
-  #Constructor. This should not be called manually.
+  # Constructor. This should not be called manually.
   def initialize(baza_db)
     super
 
@@ -46,19 +48,19 @@ class Baza::Driver::Sqlite3Java < Baza::JdbcDriver
     raise "No path was given." unless @path
 
     @stmt = nil
-    @conn = java.sql.DriverManager::getConnection("jdbc:sqlite:#{@path}")
+    @conn = java.sql.DriverManager.getConnection("jdbc:sqlite:#{@path}")
   end
 
-  #Escapes a string to be safe to used in a query.
+  # Escapes a string to be safe to used in a query.
   def escape(string)
-    #This code is taken directly from the documentation so we dont have to rely on the SQLite3::Database class. This way it can also be used with JRuby and IronRuby...
-    #http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html
-    return string.to_s.gsub(/'/, "''")
+    # This code is taken directly from the documentation so we dont have to rely on the SQLite3::Database class. This way it can also be used with JRuby and IronRuby...
+    # http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html
+    string.to_s.gsub(/'/, "''")
   end
 
-  #Returns the last inserted ID.
+  # Returns the last inserted ID.
   def last_id
-    return query("SELECT LAST_INSERT_ROWID() AS id").fetch[:id].to_i
+    query("SELECT LAST_INSERT_ROWID() AS id").fetch[:id].to_i
   end
 
   def transaction

data/lib/baza/drivers/sqlite3_rhodes.rb

@@ -1,7 +1,9 @@
-#This class handels SQLite3-specific behaviour.
+# This class handels SQLite3-specific behaviour.
 class Baza::Driver::Sqlite3Rhodes < Baza::BaseSqlDriver
   path = "#{File.dirname(__FILE__)}/sqlite3_rhodes"
 
+  autoload :Database, "#{path}/database"
+  autoload :Databases, "#{path}/databases"
   autoload :Table, "#{path}/table"
   autoload :Tables, "#{path}/tables"
   autoload :Column, "#{path}/column"
@@ -44,24 +46,24 @@ class Baza::Driver::Sqlite3Rhodes < Baza::BaseSqlDriver
 
   # Executes a query against the driver.
   def query(sql)
-    return Baza::Driver::Sqlite3::Result.new(self, @conn.execute(sql, sql))
+    Baza::Driver::Sqlite3::Result.new(self, @conn.execute(sql, sql))
   end
 
   def query_ubuf(sql)
-    return Baza::Driver::Sqlite3::UnbufferedResult.new(self, @conn.prepare(sql))
+    Baza::Driver::Sqlite3::UnbufferedResult.new(self, @conn.prepare(sql))
   end
 
   # Escapes a string to be safe to used in a query.
   def escape(string)
-    #This code is taken directly from the documentation so we dont have to rely on the SQLite3::Database class. This way it can also be used with JRuby and IronRuby...
-    #http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html
-    return string.to_s.gsub(/'/, "''")
+    # This code is taken directly from the documentation so we dont have to rely on the SQLite3::Database class. This way it can also be used with JRuby and IronRuby...
+    # http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html
+    string.to_s.gsub(/'/, "''")
   end
 
   # Returns the last inserted ID.
   def last_id
     return @conn.last_insert_row_id if @conn.respond_to?(:last_insert_row_id)
-    return query("SELECT last_insert_rowid() AS id").fetch[:id].to_i
+    query("SELECT last_insert_rowid() AS id").fetch[:id].to_i
   end
 
   # Closes the connection to the database.

data/lib/baza/dump.rb

@@ -1,78 +1,78 @@
-#This class can be used to make SQL-dumps of databases, tables or however you want it.
+# This class can be used to make SQL-dumps of databases, tables or however you want it.
 class Baza::Dump
-  #Constructor.
+  # Constructor.
   #===Examples
   # dump = Baza::Dump.new(:db => db)
   def initialize(args)
     @args = args
     @debug = @args[:debug]
   end
-  
-  #Method used to update the status.
+
+  # Method used to update the status.
   def update_status
-    return nil if !@on_status
+    return nil unless @on_status
     rows_count = Knj::Locales.number_out(@rows_count, 0)
     rows_count_total = Knj::Locales.number_out(@rows_count_total, 0)
     percent = (@rows_count.to_f / @rows_count_total.to_f) * 100
     percent_text = Knj::Locales.number_out(percent, 1)
-    @on_status.call(:text => "Dumping table: '#{@table_obj.name}' (#{rows_count}/#{rows_count_total} - #{percent_text}%).")
+    @on_status.call(text: "Dumping table: '#{@table_obj.name}' (#{rows_count}/#{rows_count_total} - #{percent_text}%).")
   end
-  
-  #Dumps all tables into the given IO.
+
+  # Dumps all tables into the given IO.
   def dump(io)
     print "Going through tables.\n" if @debug
     @rows_count = 0
-    
+
     if @args[:tables]
       tables = @args[:tables]
     else
-      tables = @args[:db].tables.list.values
+      tables = @args[:db].tables.list
     end
-    
+
     if @on_status
-      @on_status.call(:text => "Preparing.")
-      
+      @on_status.call(text: "Preparing.")
+
       @rows_count_total = 0
       tables.each do |table_obj|
         @rows_count_total += table_obj.rows_count
       end
     end
-    
+
     tables.each do |table_obj|
-      table_obj = @args[:db].tables[table_obj] if table_obj.is_a?(String) or table_obj.is_a?(Symbol)
+      table_obj = @args[:db].tables[table_obj] if table_obj.is_a?(String) || table_obj.is_a?(Symbol)
       next if table_obj.native?
-      
-      #Figure out keys.
+
+      # Figure out keys.
       @keys = []
       table_obj.columns do |col|
         @keys << col.name
       end
-      
+
       @table_obj = table_obj
-      self.update_status
+      update_status
       puts "Dumping table: '#{table_obj.name}'." if @debug
-      self.dump_table(io, table_obj)
+      dump_table(io, table_obj)
     end
   end
-  
-  #A block can be executed when a new status occurs.
+
+  # A block can be executed when a new status occurs.
   def on_status(&block)
     @on_status = block
   end
-  
-  #Dumps the given table into the given IO.
+
+  # Dumps the given table into the given IO.
   def dump_table(io, table_obj)
     create_data = table_obj.data
     create_data.delete(:name)
-    
-    #Get SQL for creating table and add it to IO.
-    sqls = @args[:db].tables.create(table_obj.name, create_data, :return_sql => true)
+
+    # Get SQL for creating table and add it to IO.
+    sqls = @args[:db].tables.create(table_obj.name, create_data, return_sql: true)
     sqls.each do |sql|
       io.write("#{sql};\n")
     end
-    
-    
-    #Try to find a primary column in the table.
+
+
+    # Try to find a primary column in the table.
     prim_col = nil
     table_obj.columns do |col|
       if col.primarykey?
@@ -80,46 +80,46 @@ class Baza::Dump
         break
       end
     end
-    
-    
-    #Set up rows and way to fill rows.
+
+
+    # Set up rows and way to fill rows.
     rows = []
     block_data = proc do |row|
       rows << row
       @rows_count += 1
-      
+
       if rows.length >= 1000
-        self.update_status
-        self.dump_insert_multi(io, table_obj, rows)
+        update_status
+        dump_insert_multi(io, table_obj, rows)
       end
     end
-    
-    
-    #If a primary column is found then use IDQuery. Otherwise use cloned unbuffered query.
-    args = {:idquery => prim_col.name.to_sym} if prim_col
-    
-    
-    #Clone the connecting with array-results and execute query.
-    @args[:db].clone_conn(:result => "array") do |db|
+
+
+    # If a primary column is found then use IDQuery. Otherwise use cloned unbuffered query.
+    args = {idquery: prim_col.name} if prim_col
+
+
+    # Clone the connecting with array-results and execute query.
+    @args[:db].clone_conn(result: "array") do |db|
       db.select(table_obj.name, nil, args, &block_data)
     end
-    
-    
-    #Dump the last rows if any.
-    self.dump_insert_multi(io, table_obj, rows) if !rows.empty?
+
+
+    # Dump the last rows if any.
+    dump_insert_multi(io, table_obj, rows) unless rows.empty?
   end
-  
-  #Dumps the given rows from the given table into the given IO.
+
+  # Dumps the given rows from the given table into the given IO.
   def dump_insert_multi(io, table_obj, rows)
     print "Inserting #{rows.length} into #{table_obj.name}.\n" if @debug
-    sqls = @args[:db].insert_multi(table_obj.name, rows, :return_sql => true, :keys => @keys)
+    sqls = @args[:db].insert_multi(table_obj.name, rows, return_sql: true, keys: @keys)
     sqls.each do |sql|
       io.write("#{sql};\n")
     end
-    
+
     rows.clear
-    
-    #Ensure garbage collection or we might start using A LOT of memory.
+
+    # Ensure garbage collection or we might start using A LOT of memory.
     GC.start
   end
-end
+end

data/lib/baza/errors.rb

@@ -1,3 +1,8 @@
 class Baza::Errors
+  class DatabaseNotFound < RuntimeError; end
+  class ColumnNotFound < RuntimeError; end
+  class IndexNotFound < RuntimeError; end
+  class NotImplemented < RuntimeError; end
   class Retry < RuntimeError; end
+  class TableNotFound < RuntimeError; end
 end

data/lib/baza/idquery.rb

@@ -1,9 +1,9 @@
-#This class takes a lot of IDs and runs a query against them.
+# This class takes a lot of IDs and runs a query against them.
 class Baza::Idquery
-  #An array containing all the IDs that will be looked up.
+  # An array containing all the IDs that will be looked up.
   attr_reader :ids
 
-  #Constructor.
+  # Constructor.
   #===Examples
   # idq = Baza::Idquery(db: db, table: :users)
   # idq.ids + [1, 5, 9]
@@ -17,7 +17,7 @@ class Baza::Idquery
 
     if @args[:query]
       @args[:db].q(@args[:query]) do |data|
-        @args[:col] = data.keys.first if !@args[:col]
+        @args[:col] = data.keys.first unless @args[:col]
 
         if data.is_a?(Array)
           @ids << data.first
@@ -27,59 +27,59 @@ class Baza::Idquery
       end
     end
 
-    @args[:col] = :id if !@args[:col]
-    @args[:size] = 200 if !@args[:size]
+    @args[:col] = :id unless @args[:col]
+    @args[:size] = 200 unless @args[:size]
 
     if block
-      raise "No query was given but a block was." if !@args[:query]
-      self.each(&block)
+      raise "No query was given but a block was." unless @args[:query]
+      each(&block)
     end
   end
 
-  #Fetches results.
+  # Fetches results.
   #===Examples
   # data = idq.fetch #=> Hash
   def fetch
-    return nil if !@args
+    return nil unless @args
 
     if @res
       data = @res.fetch if @res
-      @res = nil if !data
+      @res = nil unless data
       return data if data
     end
 
-    @res = new_res if !@res
-    if !@res
+    @res = new_res unless @res
+    unless @res
       destroy
       return nil
     end
 
     data = @res.fetch
-    if !data
+    unless data
       destroy
       return nil
     end
 
-    return data
+    data
   end
 
-  #Yields a block for every result.
+  # Yields a block for every result.
   #===Examples
   # idq.each do |data|
   #   print "Name: #{data[:name]}\n"
   # end
   def each
-    while data = self.fetch
+    while data = fetch
       yield(data)
     end
   end
 
-  private
+private
 
-  #Spawns a new database-result to read from.
+  # Spawns a new database-result to read from.
   def new_res
-    table_esc = "`#{@args[:db].esc_table(@args[:table])}`"
-    col_esc = "`#{@args[:db].esc_col(@args[:col])}`"
+    table_esc = "`#{@args[:db].escape_table(@args[:table])}`"
+    col_esc = "`#{@args[:db].escape_column(@args[:col])}`"
     ids = @ids.shift(@args[:size])
 
     if ids.empty?
@@ -87,17 +87,17 @@ class Baza::Idquery
       return nil
     end
 
-    ids_sql = ids.map { |id| "'#{@args[:db].esc(id)}'" }.join(',')
+    ids_sql = ids.map { |id| "'#{@args[:db].esc(id)}'" }.join(",")
     query_str = "SELECT * FROM #{table_esc} WHERE #{table_esc}.#{col_esc} IN (#{ids_sql})"
     print "Query: #{query_str}\n" if @debug
 
-    return @args[:db].q(query_str)
+    @args[:db].q(query_str)
   end
 
-  #Removes all variables on the object. This is done when no more results are available.
+  # Removes all variables on the object. This is done when no more results are available.
   def destroy
     @args = nil
     @ids = nil
     @debug = nil
   end
-end
+end

data/lib/baza/index.rb

@@ -1,4 +1,6 @@
 class Baza::Index
+  include Baza::DatabaseModelFunctionality
+
   def to_s
     "#<#{self.class.name} name: \"#{name}\" unique=\"#{unique?}\" columns: #{@columns}>"
   end
@@ -6,4 +8,8 @@ class Baza::Index
   def inspect
     to_s
   end
+
+  def to_param
+    name
+  end
 end

data/lib/baza/jdbc_driver.rb

@@ -81,7 +81,7 @@ private
         stmt.close if stmt
         @java_rs_data.delete(id) if result && id
 
-        if e.message == 'query does not return ResultSet'
+        if e.message == "query does not return ResultSet"
           return query_no_result_set(sql)
         else
           raise e
@@ -91,12 +91,10 @@ private
   end
 
   def query_no_result_set(sql)
-    begin
-      stmt = @conn.create_statement
-      stmt.execute(sql)
-      return nil
-    ensure
-      stmt.close if stmt
-    end
+    stmt = @conn.create_statement
+    stmt.execute(sql)
+    return nil
+  ensure
+    stmt.close if stmt
   end
 end

data/lib/baza/jdbc_result.rb

@@ -96,7 +96,7 @@ private
       hash[@keys[count]] = value
     end
 
-    return hash
+    hash
   end
 
   def translate_type(result, count)