baza 0.0.20 → 0.0.21

data/lib/baza/driver.rb

@@ -1,9 +1,4 @@
 # Subclass that contains all the drivers as further subclasses.
 class Baza::Driver
-  # Autoloader for drivers.
-  def self.const_missing(name)
-    require_relative "drivers/#{StringCases.camel_to_snake(name)}.rb"
-    raise LoadError, "Still not loaded: '#{name}'." unless Baza::Driver.const_defined?(name)
-    Baza::Driver.const_get(name)
-  end
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 end

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

@@ -1,12 +1,7 @@
 class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
-  path = "#{File.dirname(__FILE__)}/active_record"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
-  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, :driver_type
+  attr_reader :db, :conn, :sep_table, :sep_col, :sep_val, :symbolize, :driver_type
   attr_accessor :tables, :cols, :indexes
 
   def self.from_object(args)
@@ -29,9 +24,9 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
     nil
   end
 
-  def initialize(baza)
-    @baza = baza
-    @conn = @baza.opts.fetch(:conn)
+  def initialize(db)
+    @db = db
+    @conn = @db.opts.fetch(:conn)
 
     raise "No conn given" unless @conn
 
@@ -41,41 +36,59 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
       require_relative "mysql2"
       require_relative "mysql2/result"
 
+      @sep_database = "`"
       @sep_table = "`"
       @sep_col = "`"
       @sep_val = "'"
+      @sep_index = "`"
       @driver_type = :mysql2
       @result_constant = Baza::Driver::Mysql2::Result
     elsif conn_name.include?("mysql")
-      require_relative "mysql"
-      require_relative "mysql/result"
+      unless RUBY_PLATFORM == "java"
+        require_relative "mysql"
+        require_relative "mysql/result"
+        @result_constant = Baza::Driver::Mysql::Result
+      end
 
+      @sep_database = "`"
       @sep_table = "`"
       @sep_col = "`"
       @sep_val = "'"
+      @sep_index = "`"
       @driver_type = :mysql
-      @result_constant = Baza::Driver::Mysql::Result unless RUBY_PLATFORM == "java"
     elsif conn_name.include?("sqlite")
+      @sep_database = "`"
       @sep_table = "`"
       @sep_col = "`"
       @sep_val = "'"
+      @sep_index = "`"
       @driver_type = :sqlite3
+    elsif conn_name.include?("postgresqladapter")
+      @sep_database = '"'
+      @sep_table = '"'
+      @sep_col = '"'
+      @sep_index = '"'
+      @sep_val = "'"
+      @driver_type = :pg
+      @result_constant = Baza::Driver::Pg::Result
     else
-      raise "Unknown type: '#{conn_name}'."
+      raise "Unknown type: '#{conn_name}'"
     end
 
+    @result_constant ||= Baza::Driver::ActiveRecord::Result
+
     if conn_name.include?("mysql")
-      @baza.opts[:db] ||= query("SELECT DATABASE()").fetch.fetch(:"DATABASE()")
+      @db.opts[:db] ||= query("SELECT DATABASE()").fetch.fetch(:"DATABASE()")
+    elsif @driver_type == :pg
+      @db.opts[:db] ||= query("SELECT current_database()").fetch.values.first
     end
-
-    @result_constant ||= Baza::Driver::ActiveRecord::Result
   end
 
   def query(sql)
     @result_constant.new(self, @conn.execute(sql))
   end
 
-  alias_method :query_ubuf, :query
+  alias query_ubuf query
 
   def escape(str)
     @conn.quote_string(str.to_s)
@@ -98,7 +111,7 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
   end
 
   def transaction
-    if @driver_type == :mysql || @driver_type == :mysql2
+    if @driver_type == :mysql || @driver_type == :mysql2 || @driver_type == :pg
       query("START TRANSACTION")
     elsif @driver_type == :sqlite3
       query("BEGIN TRANSACTION")
@@ -107,7 +120,7 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
     end
 
     begin
-      yield @baza
+      yield @db
       query("COMMIT")
     rescue
       query("ROLLBACK")
@@ -116,6 +129,37 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
   end
 
   def supports_multiple_databases?
-    conn_name.include?("mysql")
+    conn_name.include?("mysql") || @driver_type == :pg
+  end
+
+  def save_model!(model, args = {})
+    raise ActiveRecord::InvalidRecord, model if (!args.key?(:validate) || args[:validate]) && !model.valid?
+
+    attributes = {}
+    model.changes.each do |column_name, value_array|
+      attributes[column_name.to_s] = value_array.last
+    end
+
+    attributes = attributes.delete_if { |_key, value| value.nil? } if model.new_record?
+
+    table_name = model.class.table_name
+
+    if model.new_record?
+      if args[:update_on_duplicate_key]
+        id = @db.upsert_duplicate_key(table_name, attributes, {}, return_id: true)
+      else
+        id = @db.insert(table_name, attributes, return_id: true)
+      end
+
+      if id && id.to_i > 0
+        model.id = id
+      else
+        raise "Invalid ID: #{id}" unless id.to_i > 0
+      end
+    else
+      @db.update(table_name, attributes, id: model.id)
+    end
+
+    model.reload
   end
 end

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

@@ -0,0 +1,10 @@
+class Baza::Driver::ActiveRecord::Commands
+  def initialize(args)
+    @db = args.fetch(:db)
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@db.driver.driver_type)).const_get(:Commands).new(args)
+  end
+
+  def method_missing(name, *args, &blk)
+    @proxy_to.__send__(name, *args, &blk)
+  end
+end

data/lib/baza/driver/active_record/databases.rb

@@ -0,0 +1,10 @@
+class Baza::Driver::ActiveRecord::Databases
+  def initialize(args)
+    @args = args
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args[:db].driver.driver_type)).const_get(:Databases).new(@args)
+  end
+
+  def method_missing(name, *args, &blk)
+    @proxy_to.__send__(name, *args, &blk)
+  end
+end

data/lib/baza/{drivers → driver}/active_record/result.rb

@@ -1,7 +1,7 @@
 class Baza::Driver::ActiveRecord::Result < Baza::ResultBase
   def initialize(driver, result)
     @result = result
-    @type_translation = driver.baza.opts[:type_translation]
+    @type_translation = driver.db.opts[:type_translation]
   end
 
   def fetch
@@ -14,7 +14,9 @@ class Baza::Driver::ActiveRecord::Result < Baza::ResultBase
     return unless @result
 
     @result.each do |result|
+      result = result.delete_if { |k, _v| k.is_a?(Fixnum) } # Seems like this happens depending on the version installed? - kaspernj
       result = Hash[result.map { |k, v| [k, v.to_s] }] if @type_translation == :string
+
       yield result.symbolize_keys
     end
   end

data/lib/baza/driver/active_record/users.rb

@@ -0,0 +1,12 @@
+class Baza::Driver::ActiveRecord::Users
+  def initialize(args)
+    @args = args
+
+    require "#{File.dirname(__FILE__)}/../#{@args.fetch(:db).driver.driver_type}"
+    @proxy_to = ::Baza::Driver.const_get(StringCases.snake_to_camel(@args.fetch(:db).driver.driver_type)).const_get(:Users).new(@args)
+  end
+
+  def method_missing(name, *args, &blk)
+    @proxy_to.__send__(name, *args, &blk)
+  end
+end

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

@@ -1,17 +1,5 @@
 class Baza::Driver::Mysql < Baza::MysqlBaseDriver
-  path = "#{File.dirname(__FILE__)}/mysql"
-
-  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 :UnbufferedResult, "#{path}/unbuffered_result"
-  autoload :Sqlspecs, "#{path}/sqlspecs"
+  AutoAutoloader.autoload_sub_classes(self, __FILE__)
 
   attr_reader :conn
 
@@ -19,16 +7,16 @@ class Baza::Driver::Mysql < Baza::MysqlBaseDriver
     raise "Mysql does not support auth extraction" if args[:object].class.name == "Mysql"
   end
 
-  def initialize(baza)
+  def initialize(db)
     super
 
-    @opts = @baza.opts
+    @opts = @db.opts
 
     require "monitor"
     @mutex = Monitor.new
 
-    if baza.opts[:conn]
-      @conn = baza.opts[:conn]
+    if db.opts[:conn]
+      @conn = db.opts[:conn]
     else
       if @opts[:encoding]
         @encoding = @opts[:encoding]
@@ -36,8 +24,8 @@ class Baza::Driver::Mysql < Baza::MysqlBaseDriver
         @encoding = "utf8"
       end
 
-      if @baza.opts.key?(:port)
-        @port = @baza.opts[:port].to_i
+      if @db.opts.key?(:port)
+        @port = @db.opts[:port].to_i
       else
         @port = 3306
       end
@@ -55,7 +43,7 @@ class Baza::Driver::Mysql < Baza::MysqlBaseDriver
   def reconnect
     @mutex.synchronize do
       require "mysql" unless ::Object.const_defined?(:Mysql)
-      @conn = ::Mysql.real_connect(@baza.opts[:host], @baza.opts[:user], @baza.opts[:pass], @baza.opts[:db], @port)
+      @conn = ::Mysql.real_connect(@db.opts[:host], @db.opts[:user], @db.opts[:pass], @db.opts[:db], @port)
       query("SET NAMES '#{esc(@encoding)}'") if @encoding
     end
   end
@@ -100,11 +88,6 @@ class Baza::Driver::Mysql < Baza::MysqlBaseDriver
     @conn.escape_string(string.to_s)
   end
 
-  # Returns the last inserted ID for the connection.
-  def last_id
-    @mutex.synchronize { return @conn.insert_id.to_i }
-  end
-
   # Closes the connection threadsafe.
   def close
     @mutex.synchronize { @conn.close }
@@ -113,7 +96,7 @@ class Baza::Driver::Mysql < Baza::MysqlBaseDriver
   # Destroyes the connection.
   def destroy
     @conn = nil
-    @baza = nil
+    @db = nil
     @mutex = nil
     @subtype = nil
     @encoding = nil

data/lib/baza/{drivers → driver}/mysql/column.rb

@@ -19,24 +19,6 @@ class Baza::Driver::Mysql::Column < Baza::Column
     @args.fetch(:table_name)
   end
 
-  # Returns the table-object that this column belongs to.
-  def table
-    @db.tables[table_name]
-  end
-
-  # Returns all data of the column in the knjdb-format.
-  def data
-    {
-      type: type,
-      name: name,
-      null: null?,
-      maxlength: maxlength,
-      default: default,
-      primarykey: primarykey?,
-      autoincr: autoincr?
-    }
-  end
-
   def reload
     data = @db.query("SHOW FULL COLUMNS FROM `#{@db.escape_table(table_name)}` WHERE `Field` = '#{@db.esc(name)}'").fetch
     raise Baza::Errors::ColumnNotFound unless data
@@ -47,21 +29,21 @@ class Baza::Driver::Mysql::Column < Baza::Column
   # Returns the type of the column (integer, varchar etc.).
   def type
     unless @type
-      if match = @data[:Type].match(/^([A-z]+)$/)
+      if (match = @data.fetch(:Type).match(/^([A-z]+)$/))
         @maxlength = false
         @type = match[0].to_sym
-      elsif match = @data[:Type].match(/^decimal\((\d+),(\d+)\)$/)
+      elsif (match = @data.fetch(:Type).match(/^decimal\((\d+),(\d+)\)$/))
         @maxlength = "#{match[1]},#{match[2]}"
         @type = :decimal
-      elsif match = @data[:Type].match(/^enum\((.+)\)$/)
+      elsif (match = @data.fetch(:Type).match(/^enum\((.+)\)$/))
         @maxlength = match[1]
         @type = :enum
-      elsif match = @data[:Type].match(/^(.+)\((\d+)\)/)
+      elsif (match = @data.fetch(:Type).match(/^(.+)\((\d+)\)/))
         @maxlength = match[2].to_i
         @type = match[1].to_sym
       end
 
-      raise "Still not type from: '#{@data[:Type]}'." if @type.to_s.strip.empty?
+      raise "Still no type from: '#{@data.fetch(:Type)}'" if @type.to_s.strip.empty?
     end
 
     @type
@@ -69,8 +51,7 @@ class Baza::Driver::Mysql::Column < Baza::Column
 
   # Return true if the columns allows null. Otherwise false.
   def null?
-    return false if @data[:Null] == "NO"
-    true
+    @data[:Null] != "NO"
   end
 
   # Returns the maxlength.
@@ -82,22 +63,20 @@ class Baza::Driver::Mysql::Column < Baza::Column
 
   # Returns the default value for the column.
   def default
-    return false if (type == :datetime || type == :date) && @data[:Default].to_s.strip.empty?
-    return false if (type == :int || type == :bigint) && @data[:Default].to_s.strip.empty?
-    return false unless @data[:Default]
+    return nil if (type == :datetime || type == :date) && @data[:Default].to_s.strip.empty?
+    return nil if (type == :int || type == :bigint) && @data[:Default].to_s.strip.empty?
+    return nil unless @data[:Default]
     @data.fetch(:Default)
   end
 
   # Returns true if the column is the primary key. Otherwise false.
   def primarykey?
-    return true if @data.fetch(:Key) == "PRI"
-    false
+    @data.fetch(:Key) == "PRI"
   end
 
   # Returns true if the column is auto-increasing. Otherwise false.
   def autoincr?
-    return true if @data.fetch(:Extra).include?("auto_increment")
-    false
+    @data.fetch(:Extra).include?("auto_increment")
   end
 
   # Returns the comment for the column.
@@ -114,8 +93,8 @@ class Baza::Driver::Mysql::Column < Baza::Column
 
   # Changes the column properties by the given hash.
   def change(data)
-    col_escaped = "`#{@db.escape_column(name)}`"
-    table_escape = "`#{@db.escape_table(table_name)}`"
+    col_escaped = "#{@db.sep_col}#{@db.escape_column(name)}#{@db.sep_col}"
+    table_escape = "#{@db.sep_table}#{@db.escape_table(table_name)}#{@db.sep_table}"
     newdata = data.clone
 
     newdata[:name] = name unless newdata.key?(:name)
@@ -128,7 +107,7 @@ class Baza::Driver::Mysql::Column < Baza::Column
     drop_add = true if name.to_s != newdata[:name].to_s
 
     table.__send__(:remove_column_from_list, self) if drop_add
-    @db.query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@db.cols.data_sql(newdata)}")
+    @db.query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@db.columns.data_sql(newdata)}")
     @name = newdata[:name].to_s
     reload
     table.__send__(:add_column_to_list, self) if drop_add

data/lib/baza/{drivers → driver}/mysql/columns.rb

@@ -1,12 +1,9 @@
-# This class handels various MySQL-column-specific operations.
 class Baza::Driver::Mysql::Columns
-  # Constructor. Should not be called manually.
   def initialize(args)
-    @args = args
+    @db = args.fetch(:db)
   end
 
-  # Returns the SQL for this column.
-  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames]
+  DATA_SQL_ALLOWED_KEYS = [:type, :maxlength, :name, :primarykey, :autoincr, :default, :comment, :after, :first, :storage, :null, :renames].freeze
   def data_sql(data)
     data.each_key do |key|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
@@ -15,22 +12,22 @@ class Baza::Driver::Mysql::Columns
     raise "No type given." unless data[:type]
     type = data[:type].to_sym
 
-    data[:maxlength] = 255 if type == :varchar && !data.key?(:maxlength)
+    data[:maxlength] = 255 if type == :varchar && data[:maxlength].to_s.strip.empty?
 
-    sql = "`#{data[:name]}` #{type}"
+    sql = "#{@db.sep_col}#{@db.escape_column(data.fetch(:name))}#{@db.sep_col} #{type}"
     sql << "(#{data[:maxlength]})" if data[:maxlength]
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTO_INCREMENT" if data[:autoincr]
-    sql << " NOT NULL" unless data[:null]
+    sql << " NOT NULL" if data.key?(:null) && !data[:null]
 
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
-    elsif data.key?(:default) && data[:default] != false
-      sql << " DEFAULT '#{@args[:db].escape(data[:default])}'"
+    elsif data.key?(:default) && !data[:default].nil?
+      sql << " DEFAULT #{@db.sqlval(data.fetch(:default))}"
     end
 
-    sql << " COMMENT '#{@args[:db].escape(data[:comment])}'" if data.key?(:comment)
-    sql << " AFTER `#{@args[:db].escape_column(data[:after])}`" if data[:after] && !data[:first]
+    sql << " COMMENT '#{@db.escape(data.fetch(:comment))}'" if data.key?(:comment)
+    sql << " AFTER #{@db.sep_col}#{@db.escape_column(data.fetch(:after))}#{@db.sep_col}" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]