baza 0.0.14 → 0.0.15

data/include/drivers/sqlite3/sqlite3.rb

@@ -1,47 +1,57 @@
 #This class handels SQLite3-specific behaviour.
 class Baza::Driver::Sqlite3
+  autoload :Table, "#{File.dirname(__FILE__)}/sqlite3_table"
+  autoload :Tables, "#{File.dirname(__FILE__)}/sqlite3_tables"
+  autoload :Column, "#{File.dirname(__FILE__)}/sqlite3_column"
+  autoload :Columns, "#{File.dirname(__FILE__)}/sqlite3_columns"
+  autoload :Index, "#{File.dirname(__FILE__)}/sqlite3_index"
+  autoload :Indexes, "#{File.dirname(__FILE__)}/sqlite3_indexes"
+  autoload :Result, "#{File.dirname(__FILE__)}/sqlite3_result"
+  autoload :ResultJava, "#{File.dirname(__FILE__)}/sqlite3_result_java"
+  autoload :Sqlspecs, "#{File.dirname(__FILE__)}/sqlite3_sqlspecs"
+
   attr_reader :baza, :conn, :sep_table, :sep_col, :sep_val, :symbolize
   attr_accessor :tables, :cols, :indexes
-  
+
   #Helper to enable automatic registering of database using Baza::Db.from_object
   def self.from_object(args)
     if args[:object].class.name == "SQLite3::Database"
       return {
-        :type => :success,
-        :args => {
-          :type => :sqlite3,
-          :conn => args[:object]
+        type: :success,
+        args: {
+          type: :sqlite3,
+          conn: args[:object]
         }
       }
     end
-    
+
     return nil
   end
-  
+
   #Constructor. This should not be called manually.
   def initialize(baza_db_obj)
     @sep_table = "`"
     @sep_col = "`"
     @sep_val = "'"
-    
+
     @baza_db = baza_db_obj
     @path = @baza_db.opts[:path] if @baza_db.opts[:path]
     @path = @baza_db.opts["path"] if @baza_db.opts["path"]
-    
-    @baza_db.opts[:subtype] = "java" if !@baza_db.opts.key?(:subtype) and RUBY_ENGINE == "jruby"
-    
+
+    @baza_db.opts[:subtype] = "java" if !@baza_db.opts.key?(:subtype) && RUBY_ENGINE == "jruby"
+
     if @baza_db.opts[:conn]
       @conn = @baza_db.opts[:conn]
     else
       raise "No path was given." if !@path
-      
+
       if @baza_db.opts[:subtype] == "java"
         if @baza_db.opts[:sqlite_driver]
           require @baza_db.opts[:sqlite_driver]
         else
           require "#{File.dirname(__FILE__)}/../../../jruby/sqlitejdbc-v056.jar"
         end
-        
+
         require "java"
         import "org.sqlite.JDBC"
         @conn = java.sql.DriverManager::getConnection("jdbc:sqlite:#{@baza_db.opts[:path]}")
@@ -55,7 +65,7 @@ class Baza::Driver::Sqlite3
       end
     end
   end
-  
+
   #Executes a query against the driver.
   def query(string)
     if @baza_db.opts[:subtype] == :rhodes
@@ -74,132 +84,56 @@ class Baza::Driver::Sqlite3
       return Baza::Driver::Sqlite3::Result.new(self, @conn.execute(string))
     end
   end
-  
+
   #SQLite3 driver doesnt support unbuffered queries??
   alias query_ubuf query
-  
+
   #Escapes a string to be safe to used in a query.
   def escape(string)
     #This code is taken directly from the documentation so we dont have to rely on the SQLite3::Database class. This way it can also be used with JRuby and IronRuby...
     #http://sqlite-ruby.rubyforge.org/classes/SQLite/Database.html
     return string.to_s.gsub(/'/, "''")
   end
-  
+
   #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
   alias :esc :escape
-  
+
   #Returns the last inserted ID.
-  def lastID
+  def last_id
     return @conn.last_insert_row_id if @conn.respond_to?(:last_insert_row_id)
-    return self.query("SELECT last_insert_rowid() AS id").fetch[:id].to_i
+    return query("SELECT last_insert_rowid() AS id").fetch[:id].to_i
   end
-  
+
   #Closes the connection to the database.
   def close
     @conn.close
   end
-  
+
   #Starts a transaction, yields the database and commits.
   def transaction
     @conn.transaction do
       yield(@baza_db)
     end
   end
-  
+
   def insert_multi(tablename, arr_hashes, args = nil)
-    sql = [] if args and args[:return_sql]
-    
+    sql = [] if args && args[:return_sql]
+
     @baza_db.transaction do
       arr_hashes.each do |hash|
         res = @baza_db.insert(tablename, hash, args)
-        sql << res if args and args[:return_sql]
+        sql << res if args && args[:return_sql]
       end
     end
-    
-    return sql if args and args[:return_sql]
-    return nil
-  end
-end
 
-#This class handels results when running in JRuby.
-class Baza::Driver::Sqlite3::ResultJava
-  def initialize(driver, rs)
-    @index = 0
-    retkeys = driver.knjdb.opts[:return_keys]
-    
-    if rs
-      metadata = rs.getMetaData
-      columns_count = metadata.getColumnCount
-      
-      @rows = []
-      while rs.next
-        row_data = {}
-        for i in (1..columns_count)
-          col_name = metadata.getColumnName(i).to_sym
-          row_data[col_name] = rs.getString(i)
-        end
-        
-        @rows << row_data
-      end
-    end
-  end
-  
-  #Returns a single result.
-  def fetch
-    return false if !@rows
-    ret = @rows[@index]
-    return false if !ret
-    @index += 1
-    return ret
-  end
-  
-  #Loops over every result and yields them.
-  def each
-    while data = self.fetch
-      yield(data)
-    end
+    return sql if args && args[:return_sql]
+    return nil
   end
 end
-
-#This class handels the result when running MRI (or others).
-class Baza::Driver::Sqlite3::Result
-  #Constructor. This should not be called manually.
-  def initialize(driver, result_array)
-    @result_array = result_array
-    @index = 0
-  end
-  
-  #Returns a single result.
-  def fetch
-    result_hash = @result_array[@index]
-    return false if !result_hash
-    @index += 1
-    
-    ret = {}
-    result_hash.each do |key, val|
-      if (Float(key) rescue false)
-        #do nothing.
-      elsif !key.is_a?(Symbol)
-        ret[key.to_sym] = val
-      else
-        ret[key] = val
-      end
-    end
-    
-    return ret
-  end
-  
-  #Loops over every result yielding them.
-  def each
-    while data = self.fetch
-      yield(data)
-    end
-  end
-end

data/include/drivers/sqlite3/sqlite3_column.rb

@@ -0,0 +1,146 @@
+#This class handels all the SQLite3-columns.
+class Baza::Driver::Sqlite3::Column
+  attr_reader :args
+
+  #Constructor. This should not be called manually.
+  def initialize(args)
+    @args = args
+    @db = @args[:db]
+  end
+
+  #Returns the name of the column.
+  def name
+    return @args[:data][:name].to_sym
+  end
+
+  def table_name
+    @args[:table_name]
+  end
+
+  #Returns the columns table-object.
+  def table
+    return @db.tables[table_name]
+  end
+
+  #Returns the data of the column as a hash in knjdb-format.
+  def data
+    return {
+      type: type,
+      name: name,
+      null: null?,
+      maxlength: maxlength,
+      default: default,
+      primarykey: primarykey?,
+      autoincr: autoincr?
+    }
+  end
+
+  #Returns the type of the column.
+  def type
+    if !@type
+      if match = @args[:data][:type].match(/^([A-z]+)$/)
+        @maxlength = false
+        type = match[0].to_sym
+      elsif match = @args[:data][:type].match(/^decimal\((\d+),(\d+)\)$/)
+        @maxlength = "#{match[1]},#{match[2]}"
+        type = :decimal
+      elsif match = @args[:data][:type].match(/^enum\((.+)\)$/)
+        @maxlength = match[1]
+        type = :enum
+      elsif match = @args[:data][:type].match(/^(.+)\((\d+)\)$/)
+        @maxlength = match[2]
+        type = match[1].to_sym
+      elsif @args[:data].key?(:type) and @args[:data][:type].to_s == ""
+        #A type can actually be empty in SQLite... Wtf?
+        return @args[:data][:type]
+      end
+
+      if type == :integer
+        @type = :int
+      else
+        @type = type
+      end
+
+      raise "Still not type? (#{@args[:data]})" if @type.to_s.strip.empty?
+    end
+
+    return @type
+  end
+
+  #Returns true if the column allows null. Otherwise false.
+  def null?
+    return false if @args[:data][:notnull].to_i == 1
+    return true
+  end
+
+  #Returns the maxlength of the column.
+  def maxlength
+    self.type if !@maxlength
+    return @maxlength if @maxlength
+    return false
+  end
+
+  #Returns the default value of the column.
+  def default
+    def_val = @args[:data][:dflt_value]
+
+    if def_val && match = def_val.match(/\A'(.*)'\Z/)
+      return match[1]
+    end
+
+    return false if @args[:data][:dflt_value].to_s.empty?
+    return def_val
+  end
+
+  #Returns true if the column is the primary key.
+  def primarykey?
+    return false if @args[:data][:pk].to_i == 0
+    return true
+  end
+
+  #Returns true if the column is auto-increasing.
+  def autoincr?
+    return true if @args[:data][:pk].to_i == 1 && @args[:data][:type].to_sym == :integer
+    return false
+  end
+
+  #Drops the column from the table.
+  def drop
+    table.copy(drops: name)
+  end
+
+  def reload
+    @db.q("PRAGMA table_info(`#{@db.esc_table(table_name)}`)") do |data|
+      next unless data[:name] == @args[:data][:name]
+      @args[:data] = data
+      @type = nil
+      return
+    end
+
+    raise "Could not find data for column: #{table_name}.#{name}"
+  end
+
+  #Changes data on the column. Like the name, type, maxlength or whatever.
+  def change(data)
+    newdata = data.clone
+
+    newdata[:name] = name unless newdata.key?(:name)
+    newdata[:type] = type unless newdata.key?(:type)
+    newdata[:maxlength] = maxlength unless newdata.key?(:maxlength) && maxlength
+    newdata[:null] = null? unless newdata.key?(:null)
+    newdata[:default] = default unless newdata.key?(:default)
+    newdata[:primarykey] = primarykey? unless newdata.key?(:primarykey)
+
+    @type = nil
+    @maxlength = nil
+
+    new_table = table.copy(
+      alter_columns: {
+        name.to_sym => newdata
+      }
+    )
+
+    @args[:data][:name] = newdata[:name].to_s
+    reload
+  end
+end

data/include/drivers/sqlite3/sqlite3_columns.rb

@@ -1,179 +1,47 @@
 #This class handels the SQLite3-specific behaviour for columns.
 class Baza::Driver::Sqlite3::Columns
   attr_reader :db
-  
+
   #Constructor. This should not be called manually.
   def initialize(args)
     @args = args
   end
-  
+
   DATA_SQL_ALLOWED_KEYS = [:name, :type, :maxlength, :autoincr, :primarykey, :null, :default, :default_func, :renames, :after, :renames]
   #Returns SQL for a knjdb-compatible hash.
   def data_sql(data)
     data.each do |key, val|
       raise "Invalid key: '#{key}' (#{key.class.name})." unless DATA_SQL_ALLOWED_KEYS.include?(key)
     end
-    
-    raise "No type given." if !data[:type]
+
+    raise "No type given." unless data[:type]
     type = data[:type].to_sym
-    
+
     if type == :enum
       type = :varchar
       data.delete(:maxlength)
     end
-    
-    data[:maxlength] = 255 if type == :varchar and !data.key?(:maxlength)
-    data[:maxlength] = 11 if type == :int and !data.key?(:maxlength) and !data[:autoincr] and !data[:primarykey]
-    type = :integer if @args[:db].int_types.index(type) and (data[:autoincr] or data[:primarykey])
-    
+
+    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])
+
     sql = "`#{data[:name]}` #{type}"
-    sql << "(#{data[:maxlength]})" if data[:maxlength] and !data[:autoincr]
+    sql << "(#{data[:maxlength]})" if data[:maxlength] && !data[:autoincr]
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTOINCREMENT" if data[:autoincr]
-    
-    if !data[:null] and data.key?(:null)
+
+    if !data[:null] && data.key?(:null)
       sql << " NOT NULL"
-      data[:default] = 0 if type == :int if !data.key?(:default) or !data[:default]
+      data[:default] = 0 if type == :int if !data.key?(:default) || !data[:default]
     end
-    
+
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
-    elsif data.key?(:default) and data[:default] != false
+    elsif data.key?(:default) && data[:default] != false
       sql << " DEFAULT '#{@args[:db].escape(data[:default])}'"
     end
-    
+
     return sql
   end
 end
-
-#This class handels all the SQLite3-columns.
-class Baza::Driver::Sqlite3::Columns::Column
-  attr_reader :args
-  
-  #Constructor. This should not be called manually.
-  def initialize(args)
-    @args = args
-    @db = @args[:db]
-  end
-  
-  #Returns the name of the column.
-  def name
-    return @args[:data][:name]
-  end
-  
-  #Returns the columns table-object.
-  def table
-    return @db.tables[@args[:table_name]]
-  end
-  
-  #Returns the data of the column as a hash in knjdb-format.
-  def data
-    return {
-      :type => self.type,
-      :name => self.name,
-      :null => self.null?,
-      :maxlength => self.maxlength,
-      :default => self.default,
-      :primarykey => self.primarykey?,
-      :autoincr => self.autoincr?
-    }
-  end
-  
-  #Returns the type of the column.
-  def type
-    if !@type
-      if match = @args[:data][:type].match(/^([A-z]+)$/)
-        @maxlength = false
-        type = match[0].to_sym
-      elsif match = @args[:data][:type].match(/^decimal\((\d+),(\d+)\)$/)
-        @maxlength = "#{match[1]},#{match[2]}"
-        type = :decimal
-      elsif match = @args[:data][:type].match(/^enum\((.+)\)$/)
-        @maxlength = match[1]
-        type = :enum
-      elsif match = @args[:data][:type].match(/^(.+)\((\d+)\)$/)
-        @maxlength = match[2]
-        type = match[1].to_sym
-      elsif @args[:data].key?(:type) and @args[:data][:type].to_s == ""
-        #A type can actually be empty in SQLite... Wtf?
-        return @args[:data][:type]
-      end
-      
-      if type == :integer
-        @type = :int
-      else
-        @type = type
-      end
-      
-      raise "Still not type? (#{@args[:data]})" if @type.to_s.strip.length <= 0
-    end
-    
-    return @type
-  end
-  
-  #Returns true if the column allows null. Otherwise false.
-  def null?
-    return false if @args[:data][:notnull].to_i == 1
-    return true
-  end
-  
-  #Returns the maxlength of the column.
-  def maxlength
-    self.type if !@maxlength
-    return @maxlength if @maxlength
-    return false
-  end
-  
-  #Returns the default value of the column.
-  def default
-    def_val = @args[:data][:dflt_value]
-    if def_val.to_s.slice(0..0) == "'"
-      def_val = def_val.to_s.slice(0)
-    end
-    
-    if def_val.to_s.slice(-1..-1) == "'"
-      def_val = def_val.to_s.slice(0, def_val.length - 1)
-    end
-    
-    return false if @args[:data][:dflt_value].to_s.empty?
-    return def_val
-  end
-  
-  #Returns true if the column is the primary key.
-  def primarykey?
-    return false if @args[:data][:pk].to_i == 0
-    return true
-  end
-  
-  #Returns true if the column is auto-increasing.
-  def autoincr?
-    return true if @args[:data][:pk].to_i == 1 and @args[:data][:type].to_sym == :integer
-    return false
-  end
-  
-  #Drops the column from the table.
-  def drop
-    self.table.copy(:drops => self.name)
-  end
-  
-  #Changes data on the column. Like the name, type, maxlength or whatever.
-  def change(data)
-    newdata = data.clone
-    
-    newdata[:name] = self.name if !newdata.key?(:name)
-    newdata[:type] = self.type if !newdata.key?(:type)
-    newdata[:maxlength] = self.maxlength if !newdata.key?(:maxlength) and self.maxlength
-    newdata[:null] = self.null? if !newdata.key?(:null)
-    newdata[:default] = self.default if !newdata.key?(:default)
-    newdata[:primarykey] = self.primarykey? if !newdata.key?(:primarykey)
-    
-    @type = nil
-    @maxlength = nil
-    
-    new_table = self.table.copy(
-      :alter_columns => {
-        self.name.to_sym => newdata
-      }
-    )
-  end
-end

data/include/drivers/sqlite3/sqlite3_index.rb

@@ -0,0 +1,55 @@
+class Baza::Driver::Sqlite3::Index
+  attr_reader :args, :columns
+
+  def initialize(args)
+    @args = args
+    @columns = []
+    @db = args[:db]
+  end
+
+  def name
+    return @args[:data][:name]
+  end
+
+  def table_name
+    return @args[:table_name]
+  end
+
+  def table
+    return @db.tables[table_name]
+  end
+
+  def drop
+    @db.query("DROP INDEX `#{name}`")
+  end
+
+  def rename newname
+    newname = newname.to_sym
+
+    create_args = data
+    create_args[:name] = newname
+
+    drop
+    table.create_indexes([create_args])
+    @args[:data][:name] = newname
+  end
+
+  def data
+    return {
+      name: name,
+      columns: @columns
+    }
+  end
+
+  def column_names
+    @columns
+  end
+
+  def to_s
+    "#<Baza::Driver::Sqlite3::Index name: \"#{name}\", columns: #{@columns}>"
+  end
+
+  def inspect
+    to_s
+  end
+end

data/include/drivers/sqlite3/sqlite3_indexes.rb

@@ -3,55 +3,3 @@ class Baza::Driver::Sqlite3::Indexes
     @args = args
   end
 end
-
-class Baza::Driver::Sqlite3::Indexes::Index
-  attr_reader :args, :columns
-
-  def initialize(args)
-    @args = args
-    @columns = []
-    @db = args[:db]
-  end
-
-  def name
-    return @args[:data][:name]
-  end
-
-  def table_name
-    return @args[:table_name]
-  end
-
-  def table
-    return @db.tables[table_name]
-  end
-
-  def drop
-    @db.query("DROP INDEX `#{name}`")
-  end
-
-  def rename newname
-    newname = newname.to_sym
-
-    create_args = data
-    create_args[:name] = newname
-
-    drop
-    table.create_indexes([create_args])
-    @args[:data][:name] = newname
-  end
-
-  def data
-    return {
-      name: name,
-      columns: @columns
-    }
-  end
-
-  def column_names
-    @columns
-  end
-
-  def to_s
-    "#<Baza::Driver::Sqlite3::Index name: \"#{name}\", columns: #{@columns}>"
-  end
-end