baza 0.0.20 → 0.0.21

data/lib/baza/driver/sqlite3_java/commands.rb

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

data/lib/baza/{drivers → driver}/sqlite3_java/unbuffered_result.rb

@@ -1,15 +1,14 @@
 class Baza::Driver::Sqlite3Java::UnbufferedResult < Baza::ResultBase
   def initialize(_driver, result_set)
     @result_set = result_set
+    return unless @result_set
 
-    if @result_set
-      metadata = @result_set.meta_data
-      @columns_count = metadata.column_count
+    metadata = @result_set.meta_data
+    @columns_count = metadata.column_count
 
-      @columns = []
-      1.upto(@columns_count) do |count|
-        @columns << metadata.column_name(count).to_sym
-      end
+    @columns = []
+    1.upto(@columns_count) do |count|
+      @columns << metadata.column_name(count).to_sym
     end
   end
 
@@ -26,8 +25,14 @@ class Baza::Driver::Sqlite3Java::UnbufferedResult < Baza::ResultBase
   end
 
   def each
-    while data = fetch
-      yield data
+    loop do
+      data = fetch
+
+      if data
+        yield data
+      else
+        break
+      end
     end
   end
 end

data/lib/baza/{drivers → driver}/sqlite3_rhodes.rb

@@ -1,18 +1,6 @@
 # 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"
-  autoload :Columns, "#{path}/columns"
-  autoload :Index, "#{path}/index"
-  autoload :Indexes, "#{path}/indexes"
-  autoload :Result, "#{path}/result"
-  autoload :Sqlspecs, "#{path}/sqlspecs"
-  autoload :UnbufferedResult, "#{path}/unbuffered_result"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   attr_reader :mutex_statement_reader
 
@@ -30,14 +18,14 @@ class Baza::Driver::Sqlite3Rhodes < Baza::BaseSqlDriver
   end
 
   # Constructor. This should not be called manually.
-  def initialize(baza_db)
+  def initialize(db)
     super
 
-    @path = @baza.opts[:path] if @baza.opts[:path]
+    @path = @db.opts[:path] if @db.opts[:path]
     @mutex_statement_reader = Mutex.new
 
-    if @baza.opts[:conn]
-      @conn = @baza.opts[:conn]
+    if @db.opts[:conn]
+      @conn = @db.opts[:conn]
     else
       raise "No path was given." unless @path
       @conn = ::SQLite3::Database.new(@path, @path)
@@ -60,12 +48,6 @@ class Baza::Driver::Sqlite3Rhodes < Baza::BaseSqlDriver
     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)
-    query("SELECT last_insert_rowid() AS id").fetch[:id].to_i
-  end
-
   # Closes the connection to the database.
   def close
     @mutex_statement_reader.synchronize do
@@ -75,6 +57,6 @@ class Baza::Driver::Sqlite3Rhodes < Baza::BaseSqlDriver
 
   # Starts a transaction, yields the database and commits.
   def transaction
-    @conn.transaction { yield @baza }
+    @conn.transaction { yield @db }
   end
 end

data/lib/baza/errors.rb

@@ -2,7 +2,9 @@ class Baza::Errors
   class DatabaseNotFound < RuntimeError; end
   class ColumnNotFound < RuntimeError; end
   class IndexNotFound < RuntimeError; end
+  class UserNotFound < RuntimeError; end
   class NotImplemented < RuntimeError; end
   class Retry < RuntimeError; end
   class TableNotFound < RuntimeError; end
+  class RowNotFound < RuntimeError; end
 end

data/lib/baza/idquery.rb

@@ -12,11 +12,12 @@ class Baza::Idquery
   # end
   def initialize(args, &block)
     @args = args
+    @db = args.fetch(:db)
     @ids = []
     @debug = @args[:debug]
 
     if @args[:query]
-      @args[:db].q(@args[:query]) do |data|
+      @db.q(@args.fetch(:query)) do |data|
         @args[:col] = data.keys.first unless @args[:col]
 
         if data.is_a?(Array)
@@ -69,8 +70,14 @@ class Baza::Idquery
   #   print "Name: #{data[:name]}\n"
   # end
   def each
-    while data = fetch
-      yield(data)
+    loop do
+      data = fetch
+
+      if data
+        yield data
+      else
+        break
+      end
     end
   end
 
@@ -78,8 +85,8 @@ private
 
   # Spawns a new database-result to read from.
   def new_res
-    table_esc = "`#{@args[:db].escape_table(@args[:table])}`"
-    col_esc = "`#{@args[:db].escape_column(@args[:col])}`"
+    table_esc = "#{@db.sep_table}#{@db.escape_table(@args[:table])}#{@db.sep_table}"
+    col_esc = "#{@db.sep_col}#{@db.escape_column(@args[:col])}#{@db.sep_col}"
     ids = @ids.shift(@args[:size])
 
     if ids.empty?
@@ -87,11 +94,11 @@ private
       return nil
     end
 
-    ids_sql = ids.map { |id| "'#{@args[:db].esc(id)}'" }.join(",")
+    ids_sql = ids.map { |id| "#{@db.sep_val}#{@db.esc(id)}#{@db.sep_val}" }.join(",")
     query_str = "SELECT * FROM #{table_esc} WHERE #{table_esc}.#{col_esc} IN (#{ids_sql})"
-    print "Query: #{query_str}\n" if @debug
+    puts "Query: #{query_str}" if @debug
 
-    @args[:db].q(query_str)
+    @db.q(query_str)
   end
 
   # Removes all variables on the object. This is done when no more results are available.

data/lib/baza/index.rb

@@ -5,6 +5,13 @@ class Baza::Index
     "#<#{self.class.name} name: \"#{name}\" unique=\"#{unique?}\" columns: #{@columns}>"
   end
 
+  def data
+    {
+      name: name,
+      columns: columns
+    }
+  end
+
   def inspect
     to_s
   end

data/lib/baza/jdbc_driver.rb

@@ -1,19 +1,7 @@
 class Baza::JdbcDriver < Baza::BaseSqlDriver
-  path = "#{File.dirname(__FILE__)}/mysql_java"
-
-  autoload :Table, "#{path}/table"
-  autoload :Tables, "#{path}/tables"
-  autoload :Column, "#{path}/column"
-  autoload :Columns, "#{path}/columns"
-  autoload :Index, "#{path}/index"
-  autoload :Indexes, "#{path}/indexes"
-  autoload :Result, "#{path}/result"
-  autoload :UnbufferedResult, "#{path}/unbuffered_result"
-  autoload :Sqlspecs, "#{path}/sqlspecs"
-
   attr_reader :conn, :conns
 
-  def initialize(baza)
+  def initialize(db)
     @java_rs_data = {}
     @mutex = ::Mutex.new
     super
@@ -41,7 +29,7 @@ class Baza::JdbcDriver < Baza::BaseSqlDriver
     query_with_statement(str, false) do
       stmt = @conn.create_statement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY)
 
-      if @baza.opts[:type] == :sqlite3_java
+      if @db.opts[:type] == :sqlite3_java
         stmt.fetch_size = 1
       else
         stmt.fetch_size = java.lang.Integer::MIN_VALUE
@@ -61,10 +49,10 @@ private
   def query_with_statement(sql, preload_results)
     @mutex.synchronize do
       begin
-        if sql.match(/^\s*(delete|update|create|drop|insert\s+into|alter|truncate)\s+/i)
+        if sql =~ /^\s*(delete|update|create|drop|insert\s+into|alter|truncate)\s+/i
           return query_no_result_set(sql)
         else
-          stmt = yield stmt
+          stmt = yield
 
           result_set = stmt.execute_query(sql)
           result = Baza::JdbcResult.new(self, stmt, result_set, preload_results)

data/lib/baza/jdbc_result.rb

@@ -1,17 +1,17 @@
 # This class controls the result for the Java-MySQL-driver.
 class Baza::JdbcResult < Baza::ResultBase
-  INT_TYPES = {-6 => true, -5 => true, 4 => true, 5 => true}
-  FLOAT_TYPES = {2 => true, 3 => true, 7 => true, 8 => true}
-  TIME_TYPES = {93 => true}
-  DATE_TYPES = {91 => true}
-  STRING_TYPES = {-1 => true, 1 => true, 12 => true}
-  NIL_TYPES = {0 => true}
+  INT_TYPES = {-6 => true, -5 => true, 4 => true, 5 => true}.freeze
+  FLOAT_TYPES = {2 => true, 3 => true, 7 => true, 8 => true}.freeze
+  TIME_TYPES = {93 => true}.freeze
+  DATE_TYPES = {91 => true}.freeze
+  STRING_TYPES = {-1 => true, 1 => true, 12 => true}.freeze
+  NIL_TYPES = {0 => true}.freeze
 
   # Constructor. This should not be called manually.
   def initialize(driver, stmt, result_set, preload_results)
     @result_set = result_set
     @stmt = stmt
-    @type_translation = driver.baza.opts[:type_translation]
+    @type_translation = driver.db.opts[:type_translation]
     @rows = []
     @index = -1
     read_results if preload_results
@@ -20,15 +20,21 @@ class Baza::JdbcResult < Baza::ResultBase
   def fetch
     if @read_results
       return false if @rows.empty?
-      row = @rows.shift
+      @rows.shift
     else
-      return read_row
+      read_row
     end
   end
 
   def each
-    while data = fetch
-      yield data
+    loop do
+      data = fetch
+
+      if data
+        yield data
+      else
+        break
+      end
     end
   end
 
@@ -61,7 +67,9 @@ private
     @read_results = true
 
     loop do
-      if row = read_row
+      row = read_row
+
+      if row
         @rows << row
       else
         break

data/lib/baza/mysql_base_driver.rb

@@ -22,7 +22,7 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
   end
 
   # Inserts multiple rows in a table. Can return the inserted IDs if asked to in arguments.
-  def insert_multi(tablename, arr_hashes, args = nil)
+  def insert_multi(tablename, arr_hashes, args = {})
     sql = "INSERT INTO `#{tablename}` ("
 
     first = true
@@ -59,7 +59,7 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
             sql << ","
           end
 
-          sql << @baza.sqlval(val)
+          sql << @db.sqlval(val)
         end
       else
         hash.each do |_key, val|
@@ -69,7 +69,7 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
             sql << ","
           end
 
-          sql << @baza.sqlval(val)
+          sql << @db.sqlval(val)
         end
       end
     end
@@ -99,13 +99,13 @@ class Baza::MysqlBaseDriver < Baza::BaseSqlDriver
   end
 
   def transaction
-    @baza.q("START TRANSACTION")
+    @db.q("START TRANSACTION")
 
     begin
-      yield @baza
-      @baza.q("COMMIT")
+      yield @db
+      @db.q("COMMIT")
     rescue
-      @baza.q("ROLLBACK")
+      @db.q("ROLLBACK")
       raise
     end
   end

data/lib/baza/query_buffer.rb

@@ -2,10 +2,11 @@
 class Baza::QueryBuffer
   attr_reader :thread_async
 
-  INITIALIZE_ARGS_ALLOWED = [:db, :debug, :flush_async]
+  INITIALIZE_ARGS_ALLOWED = [:db, :debug, :flush_async].freeze
   # Constructor. Takes arguments to be used and a block.
   def initialize(args)
     @args = args
+    @db = args.fetch(:db)
     @queries = []
     @inserts = {}
     @queries_count = 0
@@ -14,19 +15,12 @@ class Baza::QueryBuffer
 
     STDOUT.puts "Query buffer started." if @debug
 
-    if block_given?
-      if @args[:flush_async]
-        @args[:db].clone_conn do |db_flush_async|
-          @db_flush_async = db_flush_async
+    return unless block_given?
+
+    if @args[:flush_async]
+      @db.clone_conn do |db_flush_async|
+        @db_flush_async = db_flush_async
 
-          begin
-            yield(self)
-          ensure
-            flush
-            thread_async_join
-          end
-        end
-      else
         begin
           yield(self)
         ensure
@@ -34,6 +28,13 @@ class Baza::QueryBuffer
           thread_async_join
         end
       end
+    else
+      begin
+        yield(self)
+      ensure
+        flush
+        thread_async_join
+      end
     end
   end
 
@@ -54,7 +55,7 @@ class Baza::QueryBuffer
   # buffer.delete(:users, {:id => 5})
   def delete(table, where)
     STDOUT.puts "Delete called on table #{table} with arguments: '#{where}'." if @debug
-    query(@args[:db].delete(table, where, return_sql: true))
+    query(@db.delete(table, where, return_sql: true))
     nil
   end
 
@@ -63,7 +64,7 @@ class Baza::QueryBuffer
   # buffer.update(:users, {:name => "Kasper"}, {:id => 5})
   def update(table, update, terms)
     STDOUT.puts "Update called on table #{table}." if @debug
-    query(@args[:db].update(table, update, terms, return_sql: true))
+    query(@db.update(table, update, terms, return_sql: true))
     nil
   end
 
@@ -71,7 +72,7 @@ class Baza::QueryBuffer
   #===Example
   # buffer.upsert(:users, {:id => 5}, {:name => "Kasper"})
   def upsert(table, data, terms)
-    @args[:db].upsert(table, data, terms, buffer: self)
+    @db.upsert(table, data, terms, buffer: self)
     nil
   end
 
@@ -79,7 +80,7 @@ class Baza::QueryBuffer
   #===Examples
   # buffer.insert(:users, {:name => "John Doe"})
   def insert(table, data)
-    query(@args[:db].insert(table, data, return_sql: true))
+    query(@db.insert(table, data, return_sql: true))
     nil
   end
 
@@ -109,7 +110,7 @@ private
   end
 
   def thread_async_join
-    if thread = @thread_async
+    if (thread = @thread_async)
       thread.join
     end
   end
@@ -117,7 +118,7 @@ private
   # Flushes the queries for real.
   def flush_real(db = nil)
     return nil if @queries_count <= 0
-    db = @args[:db] if db == nil
+    db = @db if db == nil
 
     @lock.synchronize do
       unless @queries.empty?