baza 0.0.20 → 0.0.21

data/config/best_project_practice_rubocop_todo.yml

@@ -1,5 +1,11 @@
 
 
+
+
+
+
+
+
 # This configuration was generated by
 # `rubocop --auto-gen-config`
 # on 2015-12-20 21:21:20 +0100 using RuboCop version 0.35.1.

data/lib/baza.rb

@@ -1,16 +1,12 @@
 require "array_enumerator"
-require "wref"
+require "auto_autoloader"
 require "datet"
+require "simple_delegate"
 require "string-cases"
+require "wref"
 
 class Baza
-  # Autoloader for subclasses.
-  def self.const_missing(name)
-    file_name = name.to_s.gsub(/(.)([A-Z])/, '\1_\2').downcase
-    require "#{File.dirname(__FILE__)}/baza/#{file_name}.rb"
-    raise "Still not defined: '#{name}'." unless Baza.const_defined?(name)
-    Baza.const_get(name)
-  end
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   class << self
     attr_writer :default_db
@@ -37,7 +33,7 @@ class Baza
 
   def self.drivers
     Enumerator.new do |yielder|
-      Dir.foreach("#{File.dirname(__FILE__)}/baza/drivers") do |file|
+      Dir.foreach("#{File.dirname(__FILE__)}/baza/driver") do |file|
         if (match = file.match(/\A(.+?)\.rb\Z/))
           load_driver(match[1])
 
@@ -53,11 +49,11 @@ class Baza
   end
 
   def self.load_driver(name)
-    require_relative "baza/drivers/#{name}"
+    require_relative "baza/driver/#{name}"
 
-    loads = %w(databases database tables table columns column indexes index result)
+    loads = %w(databases database tables table columns column indexes index result commands)
     loads.each do |load|
-      file_path = "#{File.dirname(__FILE__)}/baza/drivers/#{name}/#{load}"
+      file_path = "#{File.dirname(__FILE__)}/baza/driver/#{name}/#{load}"
       require_relative file_path if File.exist?(file_path)
     end
   end

data/lib/baza/base_sql_driver.rb

@@ -1,16 +1,18 @@
 class Baza::BaseSqlDriver
-  attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val
+  attr_reader :db, :conn, :sep_database, :sep_table, :sep_col, :sep_val, :sep_index
   attr_accessor :tables, :cols, :indexes
 
   def self.from_object(_args)
   end
 
-  def initialize(baza)
-    @baza = baza
+  def initialize(db)
+    @db = db
 
+    @sep_database = "`"
     @sep_table = "`"
     @sep_col = "`"
     @sep_val = "'"
+    @sep_index = "`"
   end
 
   def escape(string)
@@ -25,26 +27,43 @@ class Baza::BaseSqlDriver
     end
   end
 
-  alias_method :esc, :escape
-  alias_method :escape_alternative, :escape
+  alias esc escape
+  alias escape_alternative escape
 
   # Escapes a string to be used as a column.
   def escape_column(string)
     string = string.to_s
-    raise "Invalid column-string: #{string}" unless string.index(@sep_col).nil?
+    raise "Invalid column-string: #{string}" if string.include?(@sep_col)
+    string
+  end
+
+  def escape_table(string)
+    string = string.to_s
+    raise "Invalid table-string: #{string}" if string.include?(@sep_table)
+    string
+  end
+
+  def escape_database(string)
+    string = string.to_s
+    raise "Invalid database-string: #{string}" if string.include?(@sep_database)
+    string
+  end
+
+  def escape_index(string)
+    string = string.to_s
+    raise "Invalid index-string: #{string}" if string.include?(@sep_index)
     string
   end
-  alias escape_table escape_column
-  alias escape_database escape_column
 
   def transaction
-    @baza.q("BEGIN TRANSACTION")
+    @db.q("BEGIN TRANSACTION")
 
     begin
-      yield @baza
-      @baza.q("COMMIT")
-    rescue => e
-      @baza.q("ROLLBACK")
+      yield @db
+      @db.q("COMMIT")
+    rescue
+      @db.q("ROLLBACK")
+      raise
     end
   end
 
@@ -54,70 +73,197 @@ class Baza::BaseSqlDriver
   # db.insert(:users, name: "John", lastname: "Doe")
   # id = db.insert(:users, {name: "John", lastname: "Doe"}, return_id: true)
   # sql = db.insert(:users, {name: "John", lastname: "Doe"}, return_sql: true) #=> "INSERT INTO `users` (`name`, `lastname`) VALUES ('John', 'Doe')"
-  def insert(tablename, arr_insert, args = nil)
-    sql = "INSERT INTO #{@sep_table}#{escape_table(tablename)}#{@sep_table}"
-
-    if !arr_insert || arr_insert.empty?
-      # This is the correct syntax for inserting a blank row in MySQL.
-      if @baza.opts.fetch(:type).to_s.include?("mysql")
-        sql << " VALUES ()"
-      elsif @baza.opts.fetch(:type).to_s.include?("sqlite3")
-        sql << " DEFAULT VALUES"
+  def insert(table_name, data, args = {})
+    Baza::SqlQueries::GenericInsert.new({
+      db: @db,
+      table_name: table_name,
+      data: data
+    }.merge(args)).execute
+  end
+
+  def insert_multi(tablename, arr_hashes, args = {})
+    sql = [] if args && args[:return_sql]
+
+    @db.transaction do
+      arr_hashes.each do |hash|
+        res = @db.insert(tablename, hash, args)
+        sql << res if args && args[:return_sql]
+      end
+    end
+
+    return sql if args && args[:return_sql]
+    nil
+  end
+
+  def supports_multiple_databases?
+    false
+  end
+
+  SELECT_ARGS_ALLOWED_KEYS = [:limit, :limit_from, :limit_to].freeze
+  # Makes a select from the given arguments: table-name, where-terms and other arguments as limits and orders. Also takes a block to avoid raping of memory.
+  def select(tablename, arr_terms = nil, args = nil, &block)
+    # Set up vars.
+    sql = ""
+    args_q = nil
+    select_sql = "*"
+
+    # Give 'cloned_ubuf' argument to 'q'-method.
+    args_q = {cloned_ubuf: true} if args && args[:cloned_ubuf]
+
+    # Set up IDQuery-stuff if that is given in arguments.
+    if args && args[:idquery]
+      if args.fetch(:idquery) == true
+        select_sql = "#{sep_col}id#{sep_col}"
+        col = :id
       else
-        raise "Unknown database-type: '#{@baza.opts.fetch(:type)}'."
+        select_sql = "#{sep_col}#{escape_column(args.fetch(:idquery))}#{sep_col}"
+        col = args.fetch(:idquery)
       end
+    end
+
+    sql = "SELECT #{select_sql} FROM"
+
+    if tablename.is_a?(Array)
+      sql << " #{@sep_table}#{tablename.first}#{@sep_table}.#{@sep_table}#{tablename.last}#{@sep_table}"
     else
-      sql << " ("
+      sql << " #{@sep_table}#{tablename}#{@sep_table}"
+    end
 
-      first = true
-      arr_insert.each_key do |key|
-        if first
-          first = false
+    if !arr_terms.nil? && !arr_terms.empty?
+      sql << " WHERE #{sql_make_where(arr_terms)}"
+    end
+
+    unless args.nil?
+      if args[:orderby]
+        sql << " ORDER BY"
+
+        if args.fetch(:orderby).is_a?(Array)
+          first = true
+          args.fetch(:orderby).each do |order_by|
+            sql << "," unless first
+            first = false if first
+            sql << " #{sep_col}#{escape_column(order_by)}#{sep_col}"
+          end
         else
-          sql << ", "
+          sql << " #{sep_col}#{escape_column(args.fetch(:orderby))}#{sep_col}"
         end
-
-        sql << "#{@baza.sep_col}#{@baza.escape_column(key)}#{@baza.sep_col}"
       end
 
-      sql << ") VALUES ("
+      sql << " LIMIT #{args[:limit]}" if args[:limit]
 
-      first = true
-      arr_insert.each_value do |value|
-        if first
-          first = false
-        else
-          sql << ", "
+      if args[:limit_from] && args[:limit_to]
+        begin
+          Float(args[:limit_from])
+        rescue
+          raise "'limit_from' was not numeric: '#{args.fetch(:limit_from)}'."
+        end
+
+        begin
+          Float(args[:limit_to])
+        rescue
+          raise "'limit_to' was not numeric: '#{args[:limit_to]}'."
         end
 
-        sql << @baza.sqlval(value)
+        sql << " LIMIT #{args.fetch(:limit_from)}, #{args.fetch(:limit_to)}"
       end
+    end
+
+    # Do IDQuery if given in arguments.
+    if args && args[:idquery]
+      res = Baza::Idquery.new(db: @db, table: tablename, query: sql, col: col, &block)
+    else
+      res = @db.q(sql, args_q, &block)
+    end
+
+    # Return result if a block wasnt given.
+    if block
+      return nil
+    else
+      return res
+    end
+  end
+
+  def count(tablename, arr_terms = nil)
+    sql = "SELECT COUNT(*) AS count FROM #{@sep_table}#{tablename}#{@sep_table}"
 
-      sql << ")"
+    if !arr_terms.nil? && !arr_terms.empty?
+      sql << " WHERE #{sql_make_where(arr_terms)}"
+    end
+
+    query(sql).fetch.fetch(:count).to_i
+  end
+
+  # Returns a single row from a database.
+  #
+  #===Examples
+  # row = db.single(:users, lastname: "Doe")
+  def single(tablename, terms = nil, args = {})
+    # Experienced very weird memory leak if this was not done by block. Maybe bug in Ruby 1.9.2? - knj
+    select(tablename, terms, args.merge(limit: 1)).fetch
+  end
+
+  # Deletes rows from the database.
+  #
+  #===Examples
+  # db.delete(:users, {lastname: "Doe"})
+  def delete(tablename, arr_terms, args = nil)
+    sql = "DELETE FROM #{@sep_table}#{tablename}#{@sep_table}"
+
+    if !arr_terms.nil? && !arr_terms.empty?
+      sql << " WHERE #{sql_make_where(arr_terms)}"
     end
 
     return sql if args && args[:return_sql]
 
-    @baza.query(sql)
-    return @baza.last_id if args && args[:return_id]
+    query(sql)
     nil
   end
 
-  def insert_multi(tablename, arr_hashes, args = nil)
-    sql = [] if args && args[:return_sql]
+  # Internally used to generate SQL.
+  #
+  #===Examples
+  # sql = db.sql_make_where({lastname: "Doe"}, driver_obj)
+  def sql_make_where(arr_terms, _driver = nil)
+    sql = ""
 
-    @baza.transaction do
-      arr_hashes.each do |hash|
-        res = @baza.insert(tablename, hash, args)
-        sql << res if args && args[:return_sql]
+    first = true
+    arr_terms.each do |key, value|
+      if first
+        first = false
+      else
+        sql << " AND "
+      end
+
+      if value.is_a?(Array)
+        raise "Array for column '#{key}' was empty." if value.empty?
+        values = value.map { |v| "'#{escape(v)}'" }.join(",")
+        sql << "#{@sep_col}#{key}#{@sep_col} IN (#{values})"
+      elsif value.is_a?(Hash)
+        raise "Dont know how to handle hash."
+      else
+        sql << "#{@sep_col}#{key}#{@sep_col} = #{sqlval(value)}"
       end
     end
 
-    return sql if args && args[:return_sql]
-    nil
+    sql
   end
 
-  def supports_multiple_databases?
-    false
+  # Returns the correct SQL-value for the given value.
+  # If it is a number, then just the raw number as a string will be returned.
+  # nil's will be NULL and strings will have quotes and will be escaped.
+  def sqlval(val)
+    return @conn.sqlval(val) if @conn.respond_to?(:sqlval)
+
+    if val.is_a?(Fixnum) || val.is_a?(Integer)
+      val.to_s
+    elsif val == nil
+      "NULL"
+    elsif val.is_a?(Date)
+      "#{@sep_val}#{Datet.in(val).dbstr(time: false)}#{@sep_val}"
+    elsif val.is_a?(Time) || val.is_a?(DateTime) || val.is_a?(Datet)
+      "#{@sep_val}#{Datet.in(val).dbstr}#{@sep_val}"
+    else
+      "#{@sep_val}#{escape(val)}#{@sep_val}"
+    end
   end
 end

data/lib/baza/cloner.rb

@@ -17,6 +17,7 @@ class Baza::Cloner
       Baza::Db.new(db_args)
     elsif connection.class.name.include?("MysqlAdapter")
       connection = connection.instance_variable_get(:@connection)
+      connection = connection.instance_variable_get(:@connection) if RUBY_PLATFORM == "java"
 
       db_args = {
         type: :mysql,

data/lib/baza/column.rb

@@ -12,4 +12,30 @@ class Baza::Column
   def to_param
     name
   end
+
+  def table
+    @db.tables[table_name]
+  end
+
+  def after
+    last = nil
+    table.columns.each do |column|
+      break if column.name == name
+      last = column.name
+    end
+
+    last
+  end
+
+  def data
+    {
+      type: type,
+      name: name,
+      null: null?,
+      maxlength: maxlength,
+      default: default,
+      primarykey: primarykey?,
+      autoincr: autoincr?
+    }
+  end
 end

data/lib/baza/database.rb

@@ -11,16 +11,28 @@ class Baza::Database
     @name_was = @name
   end
 
-  def tables
+  def tables(args = {})
+    list_args = {database: name}
+    list_args[:name] = args.fetch(:name) if args[:name]
+
     ArrayEnumerator.new do |yielder|
-      @db.tables.list(database: name) do |table|
+      @db.tables.list(list_args) do |table|
         yielder << table
       end
     end
   end
 
   def table(name)
-    @db.tables[name]
+    table = tables(name: name).first
+    raise Baza::Errors::TableNotFound unless table
+    table
+  end
+
+  def table_exists?(name)
+    table(name)
+    true
+  rescue Baza::Errors::TableNotFound
+    false
   end
 
   def save!
@@ -30,4 +42,8 @@ class Baza::Database
   def to_param
     name
   end
+
+  def use(&blk)
+    @db.databases.with_database(name, &blk)
+  end
 end

data/lib/baza/db.rb

@@ -12,11 +12,17 @@
 #   print data[:name]
 # end
 class Baza::Db
-  attr_reader :sep_col, :sep_table, :sep_val, :opts, :driver, :int_types
+  include SimpleDelegate
+
+  delegate :last_id, :upsert, :upsert_duplicate_key, to: :commands
+  delegate :current_database, :current_database_name, :with_database, to: :databases
+  delegate :close, :count, :delete, :esc, :escape, :escape_column, :escape_table, :escape_database, :escape_index, :insert, :select, :single, :sqlval, :sql_make_where, to: :driver
+
+  attr_reader :sep_database, :sep_col, :sep_table, :sep_val, :sep_index, :opts, :driver, :int_types
 
   # Returns an array containing hashes of information about each registered driver.
   def self.drivers
-    path = "#{File.dirname(__FILE__)}/drivers"
+    path = "#{File.dirname(__FILE__)}/driver"
     drivers = []
 
     Dir.foreach(path) do |file|
@@ -68,8 +74,10 @@ class Baza::Db
 
     @debug = @opts[:debug]
     @driver = spawn
+    @sep_database = @driver.sep_database
     @sep_table = @driver.sep_table
     @sep_col = @driver.sep_col
+    @sep_index = @driver.sep_index
     @sep_val = @driver.sep_val
 
     return unless block_given?
@@ -104,13 +112,13 @@ class Baza::Db
   # driver_instance = db.spawn
   def spawn
     raise "No type given (#{@opts.keys.join(",")})." unless @opts[:type]
-    rpath = "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}.rb"
+    rpath = "#{File.dirname(__FILE__)}/driver/#{@opts.fetch(:type)}.rb"
     require rpath if File.exist?(rpath)
     Baza::Driver.const_get(@type_cc).new(self)
   end
 
   # Registers a driver to the current thread.
-  def get_and_register_thread
+  def register_thread
     raise "Baza-object is not in threadding mode" unless @conns
 
     thread_cur = Thread.current
@@ -141,15 +149,13 @@ class Baza::Db
     @closed = true
   end
 
-  # rubocop:disable Style/TrivialAccessors
   def closed?
-    # rubocop:enable Style/TrivialAccessors
     @closed
   end
 
   # Clones the current database-connection with possible extra arguments.
   def clone_conn(args = {})
-    conn = Baza::Db.new(opts = @opts.clone.merge(args))
+    conn = Baza::Db.new(@opts.merge(args))
 
     if block_given?
       begin
@@ -164,7 +170,7 @@ class Baza::Db
     end
   end
 
-  COPY_TO_ALLOWED_ARGS = [:tables, :debug]
+  COPY_TO_ALLOWED_ARGS = [:tables, :debug].freeze
   # Copies the content of the current database to another instance of Baza::Db.
   def copy_to(db, args = {})
     debug = args[:debug]
@@ -221,31 +227,10 @@ class Baza::Db
     {tables: tables_ret}
   end
 
-  def insert(table_name, data, args = nil)
-    @driver.insert(table_name, data, args)
-  end
-
   def add_sql_to_error(error, sql)
     error.message << " (SQL: #{sql})"
   end
 
-  # Returns the correct SQL-value for the given value. If it is a number, then just the raw number as a string will be returned. nil's will be NULL and strings will have quotes and will be escaped.
-  def sqlval(val)
-    return @conn.sqlval(val) if @conn.respond_to?(:sqlval)
-
-    if val.is_a?(Fixnum) || val.is_a?(Integer)
-      return val.to_s
-    elsif val == nil
-      return "NULL"
-    elsif val.is_a?(Date)
-      return "#{@sep_val}#{Datet.in(val).dbstr(time: false)}#{@sep_val}"
-    elsif val.is_a?(Time) || val.is_a?(DateTime)
-      return "#{@sep_val}#{Datet.in(val).dbstr}#{@sep_val}"
-    else
-      return "#{@sep_val}#{escape(val)}#{@sep_val}"
-    end
-  end
-
   # Simply and optimal insert multiple rows into a table in a single query. Uses the drivers functionality if supported or inserts each row manually.
   #
   #===Examples
@@ -253,7 +238,7 @@ class Baza::Db
   #   {name: "John", lastname: "Doe"},
   #   {name: "Kasper", lastname: "Johansen"}
   # ])
-  def insert_multi(tablename, arr_hashes, args = nil)
+  def insert_multi(tablename, arr_hashes, args = {})
     return false if arr_hashes.empty?
 
     if @driver.respond_to?(:insert_multi)
@@ -284,191 +269,24 @@ class Baza::Db
   #
   #===Examples
   # db.update(:users, {name: "John"}, {lastname: "Doe"})
-  def update(tablename, hash_update, arr_terms = {}, args = nil)
-    raise "'hash_update' was not a hash: '#{hash_update.class.name}'." unless hash_update.is_a?(Hash)
-    return false if hash_update.empty?
-
-    sql = ""
-    sql << "UPDATE #{@sep_col}#{tablename}#{@sep_col} SET "
-
-    first = true
-    hash_update.each do |key, value|
-      if first
-        first = false
-      else
-        sql << ", "
-      end
-
-      # Convert dates to valid dbstr.
-      value = date_out(value) if value.is_a?(Datet) || value.is_a?(Time)
-
-      sql << "#{@sep_col}#{escape_column(key)}#{@sep_col} = "
-      sql << sqlval(value)
-    end
-
-    sql << " WHERE #{makeWhere(arr_terms)}" if arr_terms && arr_terms.length > 0
-
-    return sql if args && args[:return_sql]
-
-    query(sql)
-  end
-
-  # Checks if a given terms exists. If it does, updates it to match data. If not inserts the row.
-  def upsert(table, data, terms, args = nil)
-    row = single(table, terms)
-
-    if args && args[:buffer]
-      obj = args[:buffer]
-    else
-      obj = self
-    end
-
-    if row
-      obj.update(table, data, terms)
-    else
-      obj.insert(table, terms.merge(data))
-    end
-  end
-
-  SELECT_ARGS_ALLOWED_KEYS = [:limit, :limit_from, :limit_to]
-  # Makes a select from the given arguments: table-name, where-terms and other arguments as limits and orders. Also takes a block to avoid raping of memory.
-  def select(tablename, arr_terms = nil, args = nil, &block)
-    # Set up vars.
-    sql = ""
-    args_q = nil
-    select_sql = "*"
-
-    # Give 'cloned_ubuf' argument to 'q'-method.
-    args_q = {cloned_ubuf: true} if args && args[:cloned_ubuf]
-
-    # Set up IDQuery-stuff if that is given in arguments.
-    if args && args[:idquery]
-      if args[:idquery] == true
-        select_sql = "`id`"
-        col = :id
-      else
-        select_sql = "`#{escape_column(args[:idquery])}`"
-        col = args[:idquery]
-      end
-    end
-
-    sql = "SELECT #{select_sql} FROM"
-
-    if tablename.is_a?(Array)
-      sql << " #{@sep_table}#{tablename.first}#{@sep_table}.#{@sep_table}#{tablename.last}#{@sep_table}"
+  def update(table_name, data, terms = {}, args = {})
+    command = Baza::SqlQueries::GenericUpdate.new(
+      db: self,
+      table_name: table_name,
+      data: data,
+      terms: terms,
+      buffer: args[:buffer]
+    )
+
+    if args[:return_sql]
+      command.to_sql
     else
-      sql << " #{@sep_table}#{tablename}#{@sep_table}"
-    end
-
-    if !arr_terms.nil? && !arr_terms.empty?
-      sql << " WHERE #{makeWhere(arr_terms)}"
-    end
-
-    unless args.nil?
-      sql << " ORDER BY #{args[:orderby]}" if args[:orderby]
-      sql << " LIMIT #{args[:limit]}" if args[:limit]
-
-      if args[:limit_from] && args[:limit_to]
-        begin
-          Float(args[:limit_from])
-        rescue
-          raise "'limit_from' was not numeric: '#{args[:limit_from]}'."
-        end
-
-        begin
-          Float(args[:limit_to])
-        rescue
-          raise "'limit_to' was not numeric: '#{args[:limit_to]}'."
-        end
-
-        sql << " LIMIT #{args[:limit_from]}, #{args[:limit_to]}"
-      end
-    end
-
-    # Do IDQuery if given in arguments.
-    if args && args[:idquery]
-      res = Baza::Idquery.new(db: self, table: tablename, query: sql, col: col, &block)
-    else
-      res = q(sql, args_q, &block)
-    end
-
-    # Return result if a block wasnt given.
-    if block
-      return nil
-    else
-      return res
+      command.execute
     end
   end
 
-  def count(tablename, arr_terms = nil)
-    # Set up vars.
-    sql = ""
-    args_q = nil
-
-    sql = "SELECT COUNT(*) AS count FROM #{@sep_table}#{tablename}#{@sep_table}"
-
-    if !arr_terms.nil? && !arr_terms.empty?
-      sql << " WHERE #{makeWhere(arr_terms)}"
-    end
-
-    q(sql).fetch.fetch(:count).to_i
-  end
-
-  # Returns a single row from a database.
-  #
-  #===Examples
-  # row = db.single(:users, lastname: "Doe")
-  def single(tablename, terms = nil, args = {})
-    # Experienced very weird memory leak if this was not done by block. Maybe bug in Ruby 1.9.2? - knj
-    select(tablename, terms, args.merge(limit: 1)).fetch
-  end
-
-  alias_method :selectsingle, :single
-
-  # Deletes rows from the database.
-  #
-  #===Examples
-  # db.delete(:users, {lastname: "Doe"})
-  def delete(tablename, arr_terms, args = nil)
-    sql = "DELETE FROM #{@sep_table}#{tablename}#{@sep_table}"
-
-    if !arr_terms.nil? && !arr_terms.empty?
-      sql << " WHERE #{makeWhere(arr_terms)}"
-    end
-
-    return sql if args && args[:return_sql]
-
-    query(sql)
-    nil
-  end
-
-  # Internally used to generate SQL.
-  #
-  #===Examples
-  # sql = db.makeWhere({lastname: "Doe"}, driver_obj)
-  def makeWhere(arr_terms, _driver = nil)
-    sql = ""
-
-    first = true
-    arr_terms.each do |key, value|
-      if first
-        first = false
-      else
-        sql << " AND "
-      end
-
-      if value.is_a?(Array)
-        raise "Array for column '#{key}' was empty." if value.empty?
-        values = value.map { |v| "'#{escape(v)}'" }.join(",")
-        sql << "#{@sep_col}#{key}#{@sep_col} IN (#{values})"
-      elsif value.is_a?(Hash)
-        raise "Dont know how to handle hash."
-      else
-        sql << "#{@sep_col}#{key}#{@sep_col} = #{sqlval(value)}"
-      end
-    end
-
-    sql
+  def in_transaction?
+    @in_transaction
   end
 
   # Executes a query and returns the result.
@@ -519,7 +337,7 @@ class Baza::Db
   # db.query_ubuf('SELECT * FROM users') do |data|
   #   print data[:name]
   # end
-  def query_ubuf(string, args = nil, &block)
+  def query_ubuf(string, _args = nil, &block)
     ret = @driver.query_ubuf(string)
 
     if block
@@ -555,38 +373,6 @@ class Baza::Db
     nil
   end
 
-  # Returns the last inserted ID.
-  #
-  #===Examples
-  # id = db.last_id
-  def last_id
-    @driver.last_id
-  end
-
-  # Escapes a string to be safe-to-use in a query-string.
-  #
-  #===Examples
-  # db.q("INSERT INTO users (name) VALUES ('#{db.esc('John')}')")
-  def escape(string)
-    @driver.escape(string)
-  end
-
-  alias_method :esc, :escape
-
-  # Escapes the given string to be used as a column.
-  def escape_column(str)
-    @driver.escape_column(str)
-  end
-
-  # Escapes the given string to be used as a table.
-  def escape_table(str)
-    @driver.escape_table(str)
-  end
-
-  def escape_database(str)
-    @driver.escape_database(str)
-  end
-
   # Returns a string which can be used in SQL with the current driver.
   #===Examples
   # str = db.date_out(Time.now) #=> "2012-05-20 22:06:09"
@@ -600,33 +386,23 @@ class Baza::Db
   # db.date_in('2012-05-20 22:06:09') #=> 2012-05-20 22:06:09 +0200
   def date_in(date_obj)
     return @driver.date_in(date_obj) if @driver.respond_to?(:date_in)
-
     Datet.in(date_obj)
   end
 
-  def databases
-    require_relative "drivers/#{@opts.fetch(:type)}/databases"
-    @databases ||= Baza::Driver.const_get(@type_cc).const_get(:Databases).new(db: self)
-  end
-
-  # Returns the table-module and spawns it if it isnt already spawned.
-  def tables
-    @tables ||= Baza::Driver.const_get(@type_cc).const_get(:Tables).new(db: self)
-  end
-
-  # Returns the columns-module and spawns it if it isnt already spawned.
-  def cols
-    @cols || Baza::Driver.const_get(@type_cc).const_get(:Columns).new(db: self)
-  end
-
-  # Returns the index-module and spawns it if it isnt already spawned.
-  def indexes
-    @indexes ||= Baza::Driver.const_get(@type_cc).const_get(:Indexes).new(db: self)
-  end
+  # Defines all the driver methods: tables, columns and so on
+  DRIVER_PARTS = [:databases, :tables, :commands, :columns, :indexes, :users, :sqlspecs].freeze
+  DRIVER_PARTS.each do |driver_part|
+    define_method(driver_part) do
+      if instance_variable_defined?(:"@#{driver_part}")
+        instance_variable_get(:"@#{driver_part}")
+      else
+        require_relative "driver/#{@opts.fetch(:type)}/#{driver_part}"
 
-  # Returns the SQLSpec-module and spawns it if it isnt already spawned.
-  def sqlspecs
-    @sqlspecs ||= Baza::Driver.const_get(@type_cc).const_get(:Sqlspecs).new(db: self)
+        instance = Baza::Driver.const_get(@type_cc).const_get(StringCases.snake_to_camel(driver_part)).new(db: self)
+        instance_variable_set(:"@#{driver_part}", instance)
+        instance
+      end
+    end
   end
 
   def supports_multiple_databases?
@@ -653,8 +429,14 @@ class Baza::Db
   #   db.insert(:users, name: "Kasper")
   # end
   def transaction(&block)
-    @driver.transaction(&block)
-    nil
+    @in_transaction = true
+    begin
+      @driver.transaction(&block)
+    ensure
+      @in_transaction = false
+    end
+
+    self
   end
 
   # Optimizes all tables in the database.
@@ -665,14 +447,30 @@ class Baza::Db
       table.optimize
     end
 
-    nil
+    self
   end
 
   def to_s
-    "#<Baza::Db driver=\"#{@opts[:type]}\">"
+    "#<Baza::Db driver=\"#{@opts.fetch(:type)}\">"
   end
 
   def inspect
     to_s
   end
+
+  def new_query
+    Baza::SqlQueries::Select.new(db: self)
+  end
+
+  def sqlite?
+    @sqlite ||= @driver.class.name.downcase.include?("sqlite")
+  end
+
+  def mysql?
+    @mysql ||= @driver.class.name.downcase.include?("mysql")
+  end
+
+  def postgres?
+    @postgres ||= @driver.class.name.downcase.include?("pg")
+  end
 end