baza 0.0.17 → 0.0.18

data/lib/baza.rb

@@ -6,7 +6,7 @@ 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__)}/../include/#{file_name}.rb"
+    require "#{File.dirname(__FILE__)}/baza/#{file_name}.rb"
     raise "Still not defined: '#{name}'." unless Baza.const_defined?(name)
     return Baza.const_get(name)
   end

data/lib/baza/base_sql_driver.rb

@@ -0,0 +1,64 @@
+class Baza::BaseSqlDriver
+  attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val
+  attr_accessor :tables, :cols, :indexes
+
+  def self.from_object(args)
+  end
+
+  def initialize(baza)
+    @baza = baza
+
+    @sep_table = "`"
+    @sep_col = "`"
+    @sep_val = "'"
+  end
+
+  def escape(string)
+    return string.to_s.gsub(/([\0\n\r\032\'\"\\])/) do
+      case $1
+        when "\0" then "\\0"
+        when "\n" then "\\n"
+        when "\r" then "\\r"
+        when "\032" then "\\Z"
+        else "\\#{$1}"
+      end
+    end
+  end
+
+  alias esc escape
+  alias escape_alternative escape
+
+  #Escapes a string to be used as a column.
+  def esc_col(string)
+    string = string.to_s
+    raise "Invalid column-string: #{string}" if string.index(@sep_col) != nil
+    return string
+  end
+
+  alias esc_table esc_col
+
+  def transaction
+    query("BEGIN TRANSACTION")
+
+    begin
+      yield @baza
+      query("COMMIT")
+    rescue => e
+      query("ROLLBACK")
+    end
+  end
+
+  def insert_multi(tablename, arr_hashes, args = nil)
+    sql = [] if args && args[:return_sql]
+
+    @baza.transaction do
+      arr_hashes.each do |hash|
+        res = @baza.insert(tablename, hash, args)
+        sql << res if args && args[:return_sql]
+      end
+    end
+
+    return sql if args && args[:return_sql]
+    return nil
+  end
+end

data/lib/baza/cloner.rb

@@ -0,0 +1,31 @@
+class Baza::Cloner
+  def self.from_active_record_connection(connection)
+    if connection.class.name.include?('Mysql2Adapter')
+      connection = connection.instance_variable_get(:@connection)
+
+      config = connection.instance_variable_get(:@query_options)
+      config ||= connection.instance_variable_get(:@config)
+
+      db_args = {
+        type: :mysql2,
+        host: config[:host],
+        user: config[:username],
+        pass: config[:password],
+        db: config[:database]
+      }
+
+      Baza::Db.new(db_args)
+    elsif connection.class.name.include?('MysqlAdapter')
+      connection = connection.instance_variable_get(:@connection)
+
+      db_args = {
+        type: :mysql,
+        conn: connection
+      }
+
+      Baza::Db.new(db_args)
+    else
+      raise "Unsupported adapter: #{connection.class.name}"
+    end
+  end
+end

data/{include → lib/baza}/db.rb

@@ -1,12 +1,12 @@
 #A wrapper of several possible database-types.
 #
 #===Examples
-# db = Baza::Db.new(type: "mysql", subtype: "mysql2", db: "mysql", user: "user", pass: "password")
+# db = Baza::Db.new(type: :mysql2, db: "mysql", user: "user", pass: "password")
 # mysql_table = db.tables['mysql']
 # name = mysql_table.name
 # cols = mysql_table.columns
 #
-# db = Baza::Db.new(type: "sqlite3", path: "some_db.sqlite3")
+# db = Baza::Db.new(type: :sqlite3, path: "some_db.sqlite3")
 #
 # db.q("SELECT * FROM users") do |data|
 #   print data[:name]
@@ -43,8 +43,6 @@ class Baza::Db
     raise "No :object was given." unless args[:object]
 
     Baza::Db.drivers.each do |driver|
-      require driver[:driver_path]
-
       const = Baza::Driver.const_get(driver[:class_name])
       next unless const.respond_to?(:from_object)
 
@@ -68,19 +66,27 @@ class Baza::Db
     self.opts = opts if opts != nil
     @int_types = [:int, :bigint, :tinyint, :smallint, :mediumint]
 
-    if !@opts[:threadsafe]
-      require "monitor"
+    unless @opts[:threadsafe]
+      require 'monitor'
       @mutex = Monitor.new
     end
 
     @debug = @opts[:debug]
 
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       @sep_table = driver.sep_table
       @sep_col = driver.sep_col
       @sep_val = driver.sep_val
       @esc_driver = driver
     end
+
+    if block_given?
+      begin
+        yield self
+      ensure
+        close
+      end
+    end
   end
 
   def args
@@ -93,10 +99,9 @@ class Baza::Db
       @opts[key.to_sym] = val
     end
 
-    if RUBY_PLATFORM == "java"
-      @opts[:subtype] ||= :java
-    elsif @opts[:type] == "sqlite3" && RUBY_PLATFORM.index("mswin32") != nil
-      @opts[:subtype] ||= :ironruby
+    if RUBY_PLATFORM == 'java'
+      @opts[:type] = :sqlite3_java if @opts[:type] == :sqlite3
+      @opts[:type] = :mysql_java if @opts[:type] == :mysql || @opts[:type] == :mysql2
     end
 
     @type_cc = StringCases.snake_to_camel(@opts[:type])
@@ -130,14 +135,14 @@ 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]}/#{@opts[:type]}.rb"}"
-    require rpath if (!@opts.key?(:require) || @opts[:require]) && File.exists?(rpath)
+    rpath = "#{File.dirname(__FILE__)}/drivers/#{@opts[:type]}.rb"
+    require rpath if File.exists?(rpath)
     return Baza::Driver.const_get(@type_cc).new(self)
   end
 
   #Registers a driver to the current thread.
   def get_and_register_thread
-    raise "KnjDB-object is not in threadding mode." unless @conns
+    raise "Baza-object is not in threadding mode" unless @conns
 
     thread_cur = Thread.current
     tid = self.__id__
@@ -237,8 +242,7 @@ class Baza::Db
       loop do
         puts "Copying rows (#{limit_from}, #{limit_incr})." if debug
         ins_arr = []
-        q_rows = self.select(table_name, {}, {limit_from: limit_from, limit_to: limit_incr})
-        while d_rows = q_rows.fetch
+        q_rows = self.select(table_name, {}, {limit_from: limit_from, limit_to: limit_incr}) do |d_rows|
           col_args = nil
 
           if table_args && table_args[:columns]
@@ -285,10 +289,10 @@ class Baza::Db
     sql = "INSERT INTO #{@sep_table}#{self.esc_table(tablename)}#{@sep_table}"
 
     if !arr_insert || arr_insert.empty?
-      #This is the correct syntax for inserting a blank row in MySQL.
-      if @opts[:type].to_s == "mysql"
+      # This is the correct syntax for inserting a blank row in MySQL.
+      if @opts[:type].to_s.include?("mysql")
         sql << " VALUES ()"
-      elsif @opts[:type].to_s == "sqlite3"
+      elsif @opts[:type].to_s.include?("sqlite3")
         sql << " DEFAULT VALUES"
       else
         raise "Unknown database-type: '#{@opts[:type]}'."
@@ -325,7 +329,7 @@ class Baza::Db
 
     return sql if args && args[:return_sql]
 
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       begin
         driver.query(sql)
       rescue => e
@@ -381,7 +385,7 @@ class Baza::Db
         end
       end
 
-      self.conn_exec do |driver|
+      conn_exec do |driver|
         return driver.insert_multi(tablename, arr_hashes, args)
       end
     else
@@ -427,14 +431,14 @@ class Baza::Db
 
     return sql if args && args[:return_sql]
 
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       driver.query(sql)
     end
   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 = self.select(table, terms, "limit" => 1).fetch
+    row = self.single(table, terms)
 
     if args && args[:buffer]
       obj = args[:buffer]
@@ -510,18 +514,26 @@ class Baza::Db
     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 #{self.makeWhere(arr_terms)}"
+    end
+
+    return 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, arr_terms = nil, args = {})
-    args[:limit] = 1
-
-    #Experienced very weird memory leak if this was not done by block. Maybe bug in Ruby 1.9.2? - knj
-    self.select(tablename, arr_terms, args) do |data|
-      return data
-    end
-
+  def single(tablename, terms = nil, args = {})
+    select(tablename, terms, args.merge(limit: 1)) { |data| return data } #Experienced very weird memory leak if this was not done by block. Maybe bug in Ruby 1.9.2? - knj
     return false
   end
 
@@ -540,7 +552,7 @@ class Baza::Db
 
     return sql if args && args[:return_sql]
 
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       driver.query(sql)
     end
 
@@ -631,7 +643,7 @@ class Baza::Db
     end
 
     begin
-      self.conn_exec do |driver|
+      conn_exec do |driver|
         return driver.query(string)
       end
     rescue => e
@@ -649,7 +661,7 @@ class Baza::Db
   def query_ubuf(string, &block)
     ret = nil
 
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       ret = driver.query_ubuf(string, &block)
     end
 
@@ -690,24 +702,24 @@ class Baza::Db
   # db.q('SELECT * FROM users') do |data|
   #   print data[:name]
   # end
-  def q(str, args = nil, &block)
+  def q(sql, args = nil, &block)
     #If the query should be executed in a new connection unbuffered.
-    if args
-      if args[:cloned_ubuf]
-        raise "No block given." unless block
-
-        self.cloned_conn(clone_args: args[:clone_args]) do |cloned_conn|
-          ret = cloned_conn.query_ubuf(str)
-          ret.each(&block)
-        end
+    if args && args[:cloned_ubuf]
+      raise "No block given." unless block
 
-        return nil
-      else
-        raise "Invalid arguments given: '#{args}'."
+      self.cloned_conn(clone_args: args[:clone_args]) do |cloned_conn|
+        ret = cloned_conn.query_ubuf(sql)
+        ret.each(&block)
       end
+
+      return nil
     end
 
-    ret = self.query(str)
+    if args && args[:type] == :unbuffered
+      ret = self.query_ubuf(sql)
+    else
+      ret = self.query(sql)
+    end
 
     if block
       ret.each(&block)
@@ -728,7 +740,7 @@ class Baza::Db
   #===Examples
   # id = db.last_id
   def last_id
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       return driver.last_id
     end
   end
@@ -850,7 +862,7 @@ class Baza::Db
   #===Examples
   # db.method_on_driver
   def method_missing(method_name, *args)
-    self.conn_exec do |driver|
+    conn_exec do |driver|
       if driver.respond_to?(method_name.to_sym)
         return driver.send(method_name, *args)
       end

data/{include → lib/baza}/driver.rb

@@ -2,7 +2,7 @@
 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"
+    require_relative "drivers/#{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

data/lib/baza/drivers/active_record.rb

@@ -0,0 +1,107 @@
+class Baza::Driver::ActiveRecord
+  path = "#{File.dirname(__FILE__)}/active_record"
+
+  autoload :Tables, "#{path}/tables"
+  autoload :Columns, "#{path}/columns"
+  autoload :Indexes, "#{path}/indexes"
+  autoload :Result, "#{path}/result"
+
+  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: object_to_use
+        }
+      }
+    end
+
+    return nil
+  end
+
+  def initialize(baza)
+    @baza = baza
+    @conn = @baza.opts[:conn]
+
+    raise 'No conn given' unless @conn
+
+    conn_name = @conn.class.name.to_s.downcase
+
+    if conn_name.include?("mysql2")
+      @sep_table = "`"
+      @sep_col = "`"
+      @sep_val = "'"
+      @conn_type = :mysql2
+      @result_constant = Baza::Driver::Mysql2::Result
+    elsif conn_name.include?("mysql")
+      @sep_table = "`"
+      @sep_col = "`"
+      @sep_val = "'"
+      @conn_type = :mysql
+      @result_constant = Baza::Driver::Mysql::Result unless RUBY_PLATFORM == 'java'
+    elsif conn_name.include?("sqlite")
+      @sep_table = "`"
+      @sep_col = "`"
+      @sep_val = "'"
+      @conn_type = :sqlite3
+    else
+      raise "Unknown type: '#{conn_name}'."
+    end
+
+    @result_constant ||= Baza::Driver::ActiveRecord::Result
+  end
+
+  def query(sql)
+    @result_constant.new(self, @conn.execute(sql))
+  end
+
+  alias query_ubuf query
+
+  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 || @conn_type == :mysql2
+      query("START TRANSACTION")
+    elsif @conn_type == :sqlite3
+      query("BEGIN TRANSACTION")
+    else
+      raise "Don't know how to start transaction"
+    end
+
+    begin
+      yield @baza
+      query("COMMIT")
+    rescue
+      query("ROLLBACK")
+      raise
+    end
+  end
+end