baza 0.0.20 → 0.0.21

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

@@ -5,16 +5,17 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
   # Constructor. This should not be called manually.
   def initialize(args)
     @args = args
-    @db = @args[:db]
+    @data = args.fetch(:data)
+    @db = @args.fetch(:db)
   end
 
   # Returns the name of the column.
   def name
-    @args[:data][:name]
+    @data.fetch(:name)
   end
 
   def table_name
-    @args[:table_name]
+    @args.fetch(:table_name)
   end
 
   # Returns the columns table-object.
@@ -38,21 +39,20 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
   # Returns the type of the column.
   def type
     unless @type
-      if match = @args[:data][:type].match(/^([A-z]+)$/)
+      if (match = @data.fetch(:type).match(/^([A-z]+)$/))
         @maxlength = false
-        type = match[0].to_sym
-      elsif match = @args[:data][:type].match(/^decimal\((\d+),(\d+)\)$/)
+        type = match[0].downcase.to_sym
+      elsif (match = @data.fetch(:type).match(/^decimal\((\d+),(\d+)\)$/))
         @maxlength = "#{match[1]},#{match[2]}"
         type = :decimal
-      elsif match = @args[:data][:type].match(/^enum\((.+)\)$/)
+      elsif (match = @data.fetch(:type).match(/^enum\((.+)\)$/))
         @maxlength = match[1]
         type = :enum
-      elsif match = @args[:data][:type].match(/^(.+)\((\d+)\)$/)
+      elsif (match = @data.fetch(:type).match(/^(.+)\((\d+)\)$/))
         @maxlength = match[2]
         type = match[1].to_sym
-      elsif @args[:data].key?(:type) && @args[:data][:type].to_s == ""
-        # A type can actually be empty in SQLite... Wtf?
-        return @args[:data][:type]
+      elsif @data.key?(:type) && @data.fetch(:type).to_s == ""
+        return @data[:type] # A type can actually be empty in SQLite... Wtf?
       end
 
       if type == :integer
@@ -61,7 +61,7 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
         @type = type
       end
 
-      raise "Still not type? (#{@args[:data]})" if @type.to_s.strip.empty?
+      raise "Still not type? (#{@data})" if @type.to_s.strip.empty?
     end
 
     @type
@@ -69,39 +69,37 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
 
   # Returns true if the column allows null. Otherwise false.
   def null?
-    return false if @args[:data][:notnull].to_i == 1
+    return false if @data.fetch(:notnull).to_i == 1
     true
   end
 
   # Returns the maxlength of the column.
   def maxlength
-    type unless @maxlength
+    type unless @maxlength.nil?
     return @maxlength if @maxlength
     false
   end
 
   # Returns the default value of the column.
   def default
-    def_val = @args[:data][:dflt_value]
+    def_val = @data.fetch(:dflt_value)
 
-    if def_val && match = def_val.match(/\A'(.*)'\Z/)
+    if def_val && (match = def_val.match(/\A'(.*)'\Z/))
       return match[1]
     end
 
-    return false if @args[:data][:dflt_value].to_s.empty?
+    return nil if @data.fetch(:dflt_value).to_s.empty?
     def_val
   end
 
   # Returns true if the column is the primary key.
   def primarykey?
-    return false if @args[:data][:pk].to_i == 0
-    true
+    @data.fetch(:pk).to_i == 1
   end
 
   # Returns true if the column is auto-increasing.
   def autoincr?
-    return true if @args[:data][:pk].to_i == 1 && @args[:data][:type].to_s == "integer"
-    false
+    primarykey? && @data.fetch(:type).casecmp("integer").zero?
   end
 
   # Drops the column from the table.
@@ -112,7 +110,7 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
   def reload
     @db.q("PRAGMA table_info(`#{@db.escape_table(table_name)}`)") do |data|
       next unless data.fetch(:name) == name
-      @args[:data] = data
+      @data = data
       @type = nil
       return nil
     end
@@ -134,13 +132,13 @@ class Baza::Driver::Sqlite3::Column < Baza::Column
     @type = nil
     @maxlength = nil
 
-    new_table = table.copy(
+    table.copy(
       alter_columns: {
         name => newdata
       }
     )
 
-    @args[:data][:name] = newdata.fetch(:name).to_s
+    @data[:name] = newdata.fetch(:name).to_s
     reload
   end
 end

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

@@ -4,10 +4,10 @@ class Baza::Driver::Sqlite3::Columns
 
   # Constructor. This should not be called manually.
   def initialize(args)
-    @args = args
+    @db = args.fetch(:db)
   end
 
-  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after, :renames]
+  DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after, :renames].freeze
   # Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
     data.each_key do |key|
@@ -24,10 +24,10 @@ class Baza::Driver::Sqlite3::Columns
 
     data[:maxlength] = 255 if type == :varchar && !data.key?(:maxlength)
     data[:maxlength] = 11 if type == :int && !data.key?(:maxlength) && !data[:autoincr] && !data[:primarykey]
-    type = :integer if @args[:db].int_types.index(type) && (data[:autoincr] || data[:primarykey])
+    type = :integer if @db.int_types.index(type) && (data[:autoincr] || data[:primarykey])
 
-    sql = "`#{data[:name]}` #{type}"
-    sql << "(#{data[:maxlength]})" if data[:maxlength] && !data[:autoincr]
+    sql = "`#{data.fetch(:name)}` #{type}"
+    sql << "(#{data.fetch(:maxlength)})" if data[:maxlength] && !data[:autoincr]
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTOINCREMENT" if data[:autoincr]
 
@@ -39,7 +39,7 @@ class Baza::Driver::Sqlite3::Columns
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
     elsif data.key?(:default) && data[:default] != false
-      sql << " DEFAULT '#{@args[:db].escape(data[:default])}'"
+      sql << " DEFAULT #{@db.sqlval(data.fetch(:default))}"
     end
 
     sql

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

@@ -0,0 +1,28 @@
+class Baza::Driver::Sqlite3::Commands
+  def initialize(args)
+    @db = args.fetch(:db)
+  end
+
+  def upsert_duplicate_key(table_name, updates, terms = {}, args = {})
+    Baza::SqlQueries::SqliteUpsertDuplicateKey.new({
+      db: @db,
+      table_name: table_name,
+      updates: updates,
+      terms: terms
+    }.merge(args)).execute
+  end
+
+  def upsert(table_name, updates, terms, args = {})
+    Baza::SqlQueries::NonAtomicUpsert.new(
+      db: @db,
+      table_name: table_name,
+      buffer: args[:buffer],
+      terms: terms,
+      updates: updates
+    ).execute
+  end
+
+  def last_id
+    @db.query("SELECT last_insert_rowid() AS id").fetch.fetch(:id).to_i
+  end
+end

data/lib/baza/{drivers → driver}/sqlite3/databases.rb

@@ -1,7 +1,6 @@
 class Baza::Driver::Sqlite3::Databases
   def initialize(args)
     @db = args.fetch(:db)
-    raise "Db wasn't a baza object" unless @db.class.name.include?("Baza")
   end
 
   def [](name)

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

@@ -6,7 +6,7 @@ class Baza::Driver::Sqlite3::Result < Baza::ResultBase
 
     begin
       @statement.execute
-      @type_translation = driver.baza.opts[:type_translation]
+      @type_translation = driver.db.opts[:type_translation]
       @types = statement.types if @type_translation == true
       @columns = statement.columns.map(&:to_sym)
       read_results
@@ -32,8 +32,14 @@ class Baza::Driver::Sqlite3::Result < Baza::ResultBase
 
   # Loops over every result yielding them.
   def each
-    while data = fetch
-      yield data
+    loop do
+      data = fetch
+
+      if data
+        yield data
+      else
+        break
+      end
     end
   end
 
@@ -50,12 +56,14 @@ private
   end
 
   def translate_type(value, type)
-    return unless value
+    return if value.to_s.empty?
 
     if type == "datetime"
-      Time.parse(value)
+      return nil if value == "NULL"
+      return Time.parse(value)
     elsif type == "date"
-      Date.parse(value)
+      return nil if value == "NULL"
+      return Date.parse(value)
     else
       value
     end

data/lib/baza/{drivers → driver}/sqlite3/table.rb

@@ -87,7 +87,7 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
   end
 
   def columns
-    @db.cols
+    @db.columns
     ret = []
 
     @db.query("PRAGMA table_info(`#{@db.escape_table(name)}`)") do |d_cols|
@@ -122,14 +122,14 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
       # if col_data.key?("after")
       #  self.create_column_programmatic(col_data)
       # else
-      @db.query("ALTER TABLE `#{name}` ADD COLUMN #{@db.cols.data_sql(col_data)};")
+      @db.query("ALTER TABLE `#{name}` ADD COLUMN #{@db.columns.data_sql(col_data)};")
       # end
     end
   end
 
   def create_column_programmatic(col_data)
     temp_name = "temptable_#{Time.now.to_f.to_s.hash}"
-    cloned_tabled = clone(temp_name)
+    clone(temp_name)
     cols_cur = columns
     @db.query("DROP TABLE `#{name}`")
 
@@ -138,10 +138,10 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
     cols_cur.each do |name, col|
       sql << ", " unless first
       first = false if first
-      sql << @db.cols.data_sql(col.data)
+      sql << @db.columns.data_sql(col.data)
 
       if col_data[:after] && col_data[:after] == name
-        sql << ", #{@db.cols.data_sql(col_data)}"
+        sql << ", #{@db.columns.data_sql(col_data)}"
       end
     end
     sql << ");"
@@ -170,7 +170,7 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
     columns.each do |col|
       sql << ", " unless first
       first = false if first
-      sql << @db.cols.data_sql(col.data)
+      sql << @db.columns.data_sql(col.data)
     end
     sql << ");"
 
@@ -182,7 +182,7 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
     indexes.each do |index|
       index_name = index.name.gsub(/\A#{Regexp.escape(name)}_/, "")
 
-      if @db.opts[:index_append_table_name] && match = index_name.match(/\A(.+?)__(.+)\Z/)
+      if @db.opts[:index_append_table_name] && (match = index_name.match(/\A(.+?)__(.+)\Z/))
         index_name = match[2]
       else
         # Two indexes with the same name can't exist, and we are cloning, so we need to change the name
@@ -206,7 +206,7 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
 
   def copy(args = {})
     temp_name = "temptable_#{Time.now.to_f.to_s.hash}"
-    cloned_tabled = clone(temp_name)
+    clone(temp_name)
     cols_cur = columns
     @db.query("DROP TABLE `#{name}`")
 
@@ -219,15 +219,15 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
       first = false if first
 
       if args.key?(:alter_columns) && args[:alter_columns][col.name]
-        sql << @db.cols.data_sql(args[:alter_columns][col.name])
+        sql << @db.columns.data_sql(args[:alter_columns][col.name])
       else
-        sql << @db.cols.data_sql(col.data)
+        sql << @db.columns.data_sql(col.data)
       end
 
       next unless args[:new]
       args[:new].each do |col_data|
         if col_data[:after] && col_data[:after] == col.name
-          sql << ", #{@db.cols.data_sql(col_data)}"
+          sql << ", #{@db.columns.data_sql(col_data)}"
         end
       end
     end
@@ -333,13 +333,13 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
 
       sql = "CREATE"
       sql << " UNIQUE" if index_data[:unique]
-      sql << " INDEX '#{@db.escape_column(index_name)}' ON `#{@db.escape_table(name)}` ("
+      sql << " INDEX #{@db.sep_index}#{@db.escape_column(index_name)}#{@db.sep_index} ON #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table} ("
 
       first = true
       index_data.fetch(:columns).each do |col_name|
         sql << ", " unless first
         first = false if first
-        sql << "`#{@db.escape_column(col_name)}`"
+        sql << "#{@db.sep_col}#{@db.escape_column(col_name)}#{@db.sep_col}"
       end
 
       sql << ")"
@@ -376,8 +376,8 @@ class Baza::Driver::Sqlite3::Table < Baza::Table
     ret
   end
 
-  def insert(data)
-    @db.insert(name, data)
+  def insert(data, args = {})
+    @db.insert(name, data, args)
   end
 
   def to_s
@@ -392,6 +392,15 @@ private
 
   def parse_columns_from_sql(sql)
     columns_sql = sql.match(/\((.+?)\)\Z/)[1]
-    columns_sql.split(",").map { |column| column.match(/`(.+)`/)[1] }
+
+    columns_sql.split(",").map do |column|
+      if (match = column.match(/`(.+)`/))
+        match[1]
+      elsif (match = column.match(/"(.+)"/))
+        match[1]
+      else
+        raise "Couldn't parse column part: #{column}"
+      end
+    end
   end
 end

data/lib/baza/{drivers → driver}/sqlite3/tables.rb

@@ -14,9 +14,8 @@ class Baza::Driver::Sqlite3::Tables
   def [](table_name)
     table_name = table_name.to_s
 
-    if ret = @list.get(table_name)
-      return ret
-    end
+    ret = @list.get(table_name)
+    return ret if ret
 
     list(name: table_name) do |table|
       return table if table.name == table_name
@@ -32,7 +31,7 @@ class Baza::Driver::Sqlite3::Tables
       tables_args = {type: "table"}
       tables_args[:name] = args.fetch(:name) if args[:name]
 
-      q_tables = @db.select("sqlite_master", tables_args, orderby: "name") do |d_tables|
+      @db.select("sqlite_master", tables_args, orderby: "name") do |d_tables|
         table_name = d_tables.fetch(:name)
         next if table_name == "sqlite_sequence"
 
@@ -76,7 +75,7 @@ class Baza::Driver::Sqlite3::Tables
     @list[table.name] = table
   end
 
-  CREATE_ALLOWED_KEYS = [:indexes, :columns]
+  CREATE_ALLOWED_KEYS = [:indexes, :columns].freeze
   def create(name, data, args = nil)
     data.each_key do |key|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless CREATE_ALLOWED_KEYS.include?(key)
@@ -90,7 +89,7 @@ class Baza::Driver::Sqlite3::Tables
     data.fetch(:columns).each do |col_data|
       sql << ", " unless first
       first = false if first
-      sql << @db.cols.data_sql(col_data)
+      sql << @db.columns.data_sql(col_data)
     end
 
     sql << ")"

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

@@ -19,8 +19,14 @@ class Baza::Driver::Sqlite3::UnbufferedResult
   end
 
   def each
-    while data = fetch
-      yield data
+    loop do
+      data = fetch
+
+      if data
+        yield data
+      else
+        break
+      end
     end
   end
 

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

@@ -1,18 +1,6 @@
 # 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"
-  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
 
@@ -29,15 +17,22 @@ class Baza::Driver::Sqlite3Java < Baza::JdbcDriver
     end
   end
 
+  def self.args
+    [{
+      label: "Path",
+      name: "path"
+    }]
+  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]
     @preload_results = true
 
-    if @baza.opts[:conn]
-      @conn = @baza.opts[:conn]
+    if @db.opts[:conn]
+      @conn = @db.opts[:conn]
     else
       org.sqlite.JDBC
       reconnect
@@ -58,16 +53,11 @@ class Baza::Driver::Sqlite3Java < Baza::JdbcDriver
     string.to_s.gsub(/'/, "''")
   end
 
-  # Returns the last inserted ID.
-  def last_id
-    query("SELECT LAST_INSERT_ROWID() AS id").fetch[:id].to_i
-  end
-
   def transaction
     query_no_result_set("BEGIN TRANSACTION")
 
     begin
-      yield @baza
+      yield @db
       query_no_result_set("COMMIT")
     rescue
       query_no_result_set("ROLLBACK")