jdbc_driver.rb in baza-0.0.21

- old
+ new

@@ -1,21 +1,9 @@
 class Baza::JdbcDriver < Baza::BaseSqlDriver
-  path = "#{File.dirname(__FILE__)}/mysql_java"
-
-  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"
-
   attr_reader :conn, :conns
 
-  def initialize(baza)
+  def initialize(db)
     @java_rs_data = {}
     @mutex = ::Mutex.new
     super
   end
 
@@ -39,11 +27,11 @@
   # Executes an unbuffered query and returns the result that can be used to access the data.
   def query_ubuf(str)
     query_with_statement(str, false) do
       stmt = @conn.create_statement(java.sql.ResultSet.TYPE_FORWARD_ONLY, java.sql.ResultSet.CONCUR_READ_ONLY)
 
-      if @baza.opts[:type] == :sqlite3_java
+      if @db.opts[:type] == :sqlite3_java
         stmt.fetch_size = 1
       else
         stmt.fetch_size = java.lang.Integer::MIN_VALUE
       end
 
@@ -59,13 +47,13 @@
 private
 
   def query_with_statement(sql, preload_results)
     @mutex.synchronize do
       begin
-        if sql.match(/^\s*(delete|update|create|drop|insert\s+into|alter|truncate)\s+/i)
+        if sql =~ /^\s*(delete|update|create|drop|insert\s+into|alter|truncate)\s+/i
           return query_no_result_set(sql)
         else
-          stmt = yield stmt
+          stmt = yield
 
           result_set = stmt.execute_query(sql)
           result = Baza::JdbcResult.new(self, stmt, result_set, preload_results)
 
           id = result.__id__