baza 0.0.15 → 0.0.16

data/include/drivers/mysql/mysql_column.rb

@@ -1,5 +1,5 @@
 #This class handels every MySQL-column, that can be returned from a table-object.
-class Baza::Driver::Mysql::Column
+class Baza::Driver::Mysql::Column < Baza::Column
   attr_reader :args, :name
 
   #Constructor. Should not be called manually.

data/include/drivers/mysql/mysql_index.rb

@@ -1,4 +1,4 @@
-class Baza::Driver::Mysql::Index
+class Baza::Driver::Mysql::Index < Baza::Index
   attr_reader :args, :columns
 
   def initialize(args)
@@ -53,7 +53,7 @@ class Baza::Driver::Mysql::Index
 
   #Returns true if the index is a unique-index.
   def unique?
-    if @args[:data][:Index_type] == "UNIQUE"
+    if @args[:data][:Index_type] == "UNIQUE" || @args[:data][:Non_unique].to_i == 0
       return true
     else
       return false
@@ -65,12 +65,4 @@ class Baza::Driver::Mysql::Index
     return true if @args[:data][:Key_name] == "PRIMARY"
     return false
   end
-
-  def to_s
-    return "#<Baza::Driver::Mysql::Index name: \"#{name}\", columns: #{@columns}, primary: #{primary?}, unique: #{unique?}>"
-  end
-
-  def inspect
-    to_s
-  end
 end

data/include/drivers/mysql/mysql_table.rb

@@ -1,4 +1,4 @@
-class Baza::Driver::Mysql::Table
+class Baza::Driver::Mysql::Table < Baza::Table
   attr_reader :list, :name
 
   def initialize(args)
@@ -6,8 +6,8 @@ class Baza::Driver::Mysql::Table
     @db = args[:db]
     @data = args[:data]
     @subtype = @db.opts[:subtype]
-    @list = Wref_map.new
-    @indexes_list = Wref_map.new
+    @list = Wref::Map.new
+    @indexes_list = Wref::Map.new
     @name = @data[:Name].to_sym
     @tables = args[:tables]
 
@@ -48,7 +48,7 @@ class Baza::Driver::Mysql::Table
   def column(name)
     name = name.to_sym
 
-    if col = @list.get!(name)
+    if col = @list.get(name)
       return @list[name]
     end
 
@@ -63,11 +63,11 @@ class Baza::Driver::Mysql::Table
     @db.cols
     ret = {}
     sql = "SHOW FULL COLUMNS FROM `#{@db.esc_table(name)}`"
-    sql << " WHERE `Field` = '#{@db.esc(args[:name])}'" if args and args.key?(:name)
+    sql << " WHERE `Field` = '#{@db.esc(args[:name])}'" if args && args.key?(:name)
 
     @db.q(sql) do |d_cols|
       column_name = d_cols[:Field].to_sym
-      obj = @list.get!(name)
+      obj = @list.get(name)
 
       unless obj
         obj = Baza::Driver::Mysql::Column.new(
@@ -92,7 +92,7 @@ class Baza::Driver::Mysql::Table
     end
   end
 
-  def indexes args = nil
+  def indexes(args = nil)
     @db.indexes
     ret = {}
 
@@ -101,7 +101,7 @@ class Baza::Driver::Mysql::Table
 
     @db.q(sql) do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
-      obj = @indexes_list.get!(d_indexes[:Key_name].to_s)
+      obj = @indexes_list.get(d_indexes[:Key_name].to_s)
 
       unless obj
         obj = Baza::Driver::Mysql::Index.new(
@@ -130,7 +130,7 @@ class Baza::Driver::Mysql::Table
   def index(name)
     name = name.to_s
 
-    if index = @indexes_list.get!(name)
+    if index = @indexes_list.get(name)
       return index
     end
 
@@ -167,7 +167,7 @@ class Baza::Driver::Mysql::Table
         sql = ""
       end
 
-      if args[:create] or !args.key?(:create)
+      if args[:create] || !args.key?(:create)
         sql << "CREATE"
       end
 
@@ -217,7 +217,7 @@ class Baza::Driver::Mysql::Table
     end
   end
 
-  def rename newname
+  def rename(newname)
     newname = newname.to_sym
     oldname = name
 

data/include/drivers/mysql/mysql_tables.rb

@@ -10,7 +10,7 @@ class Baza::Driver::Mysql::Tables
     @db = @args[:db]
     @subtype = @db.opts[:subtype]
     @list_mutex = Monitor.new
-    @list = Wref_map.new
+    @list = Wref::Map.new
     @list_should_be_reloaded = true
   end
 
@@ -23,10 +23,8 @@ class Baza::Driver::Mysql::Tables
   def [](table_name)
     table_name = table_name.to_sym
 
-    begin
-      return @list[table_name]
-    rescue Wref::Recycled
-      #ignore.
+    if table = @list[table_name]
+      return table
     end
 
     tables = []
@@ -52,9 +50,9 @@ class Baza::Driver::Mysql::Tables
       @db.q(sql) do |d_tables|
         raise "No name was given from: #{d_tables}" unless d_tables.is_a?(Hash) && d_tables[:Name]
         name = d_tables[:Name].to_sym
-        obj = @list.get!(name)
+        obj = @list.get(name)
 
-        if !obj
+        unless obj
           obj = Baza::Driver::Mysql::Table.new(
             db: @db,
             data: d_tables,

data/include/drivers/sqlite3/sqlite3.rb

@@ -23,43 +23,52 @@ class Baza::Driver::Sqlite3
           conn: args[:object]
         }
       }
+    elsif args[:object].class.name == "Java::OrgSqlite::SQLiteConnection"
+      return {
+        type: :success,
+        args: {
+          type: :sqlite3,
+          conn: args[:object]
+        }
+      }
     end
 
     return nil
   end
 
   #Constructor. This should not be called manually.
-  def initialize(baza_db_obj)
+  def initialize(baza_db)
     @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 = baza_db
+    @path = @baza.opts[:path] if @baza.opts[:path]
+    @baza.opts[:subtype] ||= :java if RUBY_ENGINE == "jruby"
+    @subtype = @baza.opts[:subtype]
 
-    @baza_db.opts[:subtype] = "java" if !@baza_db.opts.key?(:subtype) && RUBY_ENGINE == "jruby"
-
-    if @baza_db.opts[:conn]
-      @conn = @baza_db.opts[:conn]
+    if @baza.opts[:conn]
+      @conn = @baza.opts[:conn]
+      @stat = @conn.createStatement if @subtype == :java
     else
-      raise "No path was given." if !@path
+      raise "No path was given." unless @path
 
-      if @baza_db.opts[:subtype] == "java"
-        if @baza_db.opts[:sqlite_driver]
-          require @baza_db.opts[:sqlite_driver]
+      if @subtype == :java
+        if @baza.opts[:sqlite_driver]
+          require @baza.opts[:sqlite_driver]
         else
-          require "#{File.dirname(__FILE__)}/../../../jruby/sqlitejdbc-v056.jar"
+          require "jdbc/sqlite3"
+          ::Jdbc::SQLite3.load_driver
         end
 
         require "java"
         import "org.sqlite.JDBC"
-        @conn = java.sql.DriverManager::getConnection("jdbc:sqlite:#{@baza_db.opts[:path]}")
+        @conn = java.sql.DriverManager::getConnection("jdbc:sqlite:#{@baza.opts[:path]}")
         @stat = @conn.createStatement
-      elsif @baza_db.opts[:subtype] == "rhodes"
-        @conn = SQLite3::Database.new(@path, @path)
+      elsif @subtype == :rhodes
+        @conn = ::SQLite3::Database.new(@path, @path)
       else
-        @conn = SQLite3::Database.open(@path)
+        @conn = ::SQLite3::Database.open(@path)
         @conn.results_as_hash = true
         @conn.type_translation = false
       end
@@ -68,9 +77,9 @@ class Baza::Driver::Sqlite3
 
   #Executes a query against the driver.
   def query(string)
-    if @baza_db.opts[:subtype] == :rhodes
+    if @subtype == :rhodes
       return Baza::Driver::Sqlite3::Result.new(self, @conn.execute(string, string))
-    elsif @baza_db.opts[:subtype] == :java
+    elsif @subtype == :java
       begin
         return Baza::Driver::Sqlite3::ResultJava.new(self, @stat.executeQuery(string))
       rescue java.sql.SQLException => e
@@ -118,17 +127,28 @@ class Baza::Driver::Sqlite3
 
   #Starts a transaction, yields the database and commits.
   def transaction
-    @conn.transaction do
-      yield(@baza_db)
+    if @subtype == :java
+      query("BEGIN TRANSACTION")
+
+      begin
+        yield(@baza)
+        query("COMMIT")
+      rescue => e
+        query("ROLLBACK")
+      end
+    else
+      @conn.transaction do
+        yield(@baza)
+      end
     end
   end
 
   def insert_multi(tablename, arr_hashes, args = nil)
     sql = [] if args && args[:return_sql]
 
-    @baza_db.transaction do
+    @baza.transaction do
       arr_hashes.each do |hash|
-        res = @baza_db.insert(tablename, hash, args)
+        res = @baza.insert(tablename, hash, args)
         sql << res if args && args[:return_sql]
       end
     end

data/include/drivers/sqlite3/sqlite3_column.rb

@@ -1,5 +1,5 @@
 #This class handels all the SQLite3-columns.
-class Baza::Driver::Sqlite3::Column
+class Baza::Driver::Sqlite3::Column < Baza::Column
   attr_reader :args
 
   #Constructor. This should not be called manually.

data/include/drivers/sqlite3/sqlite3_index.rb

@@ -1,4 +1,4 @@
-class Baza::Driver::Sqlite3::Index
+class Baza::Driver::Sqlite3::Index < Baza::Index
   attr_reader :args, :columns
 
   def initialize(args)
@@ -23,7 +23,7 @@ class Baza::Driver::Sqlite3::Index
     @db.query("DROP INDEX `#{name}`")
   end
 
-  def rename newname
+  def rename(newname)
     newname = newname.to_sym
 
     create_args = data
@@ -37,6 +37,7 @@ class Baza::Driver::Sqlite3::Index
   def data
     return {
       name: name,
+      unique: unique?,
       columns: @columns
     }
   end
@@ -45,11 +46,7 @@ class Baza::Driver::Sqlite3::Index
     @columns
   end
 
-  def to_s
-    "#<Baza::Driver::Sqlite3::Index name: \"#{name}\", columns: #{@columns}>"
-  end
-
-  def inspect
-    to_s
+  def unique?
+    @args[:data][:unique].to_i == 1
   end
 end

data/include/drivers/sqlite3/sqlite3_result_java.rb

@@ -2,7 +2,7 @@
 class Baza::Driver::Sqlite3::ResultJava
   def initialize(driver, rs)
     @index = 0
-    retkeys = driver.knjdb.opts[:return_keys]
+    retkeys = driver.baza.opts[:return_keys]
 
     if rs
       metadata = rs.getMetaData

data/include/drivers/sqlite3/sqlite3_table.rb

@@ -1,4 +1,4 @@
-class Baza::Driver::Sqlite3::Table
+class Baza::Driver::Sqlite3::Table < Baza::Table
   attr_reader :name, :type
 
   def initialize(args)
@@ -8,8 +8,8 @@ class Baza::Driver::Sqlite3::Table
     @type = @data[:type].to_sym
     @tables = args[:tables]
 
-    @list = Wref_map.new
-    @indexes_list = Wref_map.new
+    @list = Wref::Map.new
+    @indexes_list = Wref::Map.new
   end
 
   def maxlength
@@ -84,7 +84,7 @@ class Baza::Driver::Sqlite3::Table
 
     @db.q("PRAGMA table_info(`#{@db.esc_table(name)}`)") do |d_cols|
       column_name = d_cols[:name].to_sym
-      obj = @list.get!(column_name)
+      obj = @list.get(column_name)
 
       unless obj
         obj = Baza::Driver::Sqlite3::Column.new(
@@ -223,6 +223,7 @@ class Baza::Driver::Sqlite3::Table
         end
       end
     end
+
     sql << ");"
     @db.query(sql)
 
@@ -250,20 +251,18 @@ class Baza::Driver::Sqlite3::Table
     @db.query("DROP TABLE `#{temp_name}`")
   end
 
-  def index index_name
+  def index(index_name)
     index_name = index_name.to_sym
 
-    begin
-      return @indexes_list[index_name]
-    rescue Wref::Recycled
-      if @db.opts[:index_append_table_name]
-        tryname = "#{name}__#{index_name}"
+    if index = @indexes_list[index_name]
+      return index
+    end
 
-        begin
-          return @indexes_list[tryname]
-        rescue Wref::Recycled
-          #ignore.
-        end
+    if @db.opts[:index_append_table_name]
+      tryname = "#{name}__#{index_name}"
+
+      if index = @indexes_list[tryname]
+        return index
       end
     end
 
@@ -284,7 +283,7 @@ class Baza::Driver::Sqlite3::Table
 
     @db.q("PRAGMA index_list(`#{@db.esc_table(name)}`)") do |d_indexes|
       next if d_indexes[:Key_name] == "PRIMARY"
-      obj = @indexes_list.get!(d_indexes[:name])
+      obj = @indexes_list.get(d_indexes[:name])
 
       unless obj
         obj = Baza::Driver::Sqlite3::Index.new(
@@ -326,8 +325,8 @@ class Baza::Driver::Sqlite3::Table
         index_data = {name: index_data, columns: [index_data]}
       end
 
-      raise "No name was given in data: '#{index_data}'." if !index_data.key?(:name) or index_data[:name].to_s.strip.empty?
-      raise "No columns was given on index #{index_data[:name]}." if index_data[:columns].empty?
+      raise "No name was given in data: '#{index_data}'." if !index_data.key?(:name) || index_data[:name].to_s.strip.empty?
+      raise "No columns was given on index #{index_data[:name]}." if !index_data[:columns] || index_data[:columns].empty?
 
       name = index_data[:name]
       name = "#{self.name}__#{name}" if @db.opts[:index_append_table_name]

data/include/drivers/sqlite3/sqlite3_tables.rb

@@ -6,17 +6,14 @@ class Baza::Driver::Sqlite3::Tables
     @db = @args[:db]
 
     @list_mutex = Mutex.new
-    @list = Wref_map.new
+    @list = Wref::Map.new
   end
 
   def [](table_name)
     table_name = table_name.to_sym
 
-    begin
-      ret = @list[table_name]
+    if ret = @list.get(table_name)
       return ret
-    rescue Wref::Recycled
-      #ignore.
     end
 
     self.list do |table_obj|
@@ -34,9 +31,9 @@ class Baza::Driver::Sqlite3::Tables
         next if d_tables[:name] == "sqlite_sequence"
 
         tname = d_tables[:name].to_sym
-        obj = @list.get!(tname)
+        obj = @list.get(tname)
 
-        if !obj
+        unless obj
           obj = Baza::Driver::Sqlite3::Table.new(
             db: @db,
             data: d_tables,

data/include/index.rb

@@ -0,0 +1,9 @@
+class Baza::Index
+  def to_s
+    "#<#{self.class.name} name: \"#{name}\" unique=\"#{unique?}\" columns: #{@columns}>"
+  end
+
+  def inspect
+    to_s
+  end
+end

data/include/model.rb

@@ -453,7 +453,7 @@ class Baza::Model
         enum.each(&block)
         return nil
       elsif @ob.args[:array_enum]
-        return Array_enumerator.new(enum)
+        return ArrayEnumerator.new(enum)
       else
         return enum.to_a
       end