baza 0.0.17 → 0.0.18

data/lib/baza/jdbc_driver.rb

@@ -0,0 +1,102 @@
+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)
+    @java_rs_data = {}
+    @mutex = ::Mutex.new
+    super
+  end
+
+  # This method handels the closing of statements and results for the Java MySQL-mode.
+  def result_set_killer(id)
+    data = @java_rs_data[id]
+    return nil unless data
+
+    data[:res].close
+    data[:stmt].close
+    @java_rs_data.delete(id)
+  end
+
+  # Executes a query and returns the result.
+  def query(str)
+    query_with_statement(str, @preload_results) do
+      @conn.create_statement
+    end
+  end
+
+  # 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
+        stmt.fetch_size = 1
+      else
+        stmt.fetch_size = java.lang.Integer::MIN_VALUE
+      end
+
+      stmt
+    end
+  end
+
+  # Closes the connection threadsafe.
+  def close
+    @mutex.synchronize { @conn.close }
+  end
+
+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)
+          return query_no_result_set(sql)
+        else
+          stmt = yield stmt
+
+          result_set = stmt.execute_query(sql)
+          result = Baza::JdbcResult.new(self, stmt, result_set, preload_results)
+
+          id = result.__id__
+          result_set_killer(id) if @java_rs_data.key?(id)
+          @java_rs_data[id] = {res: result_set, stmt: stmt}
+          ObjectSpace.define_finalizer(result, method(:result_set_killer))
+
+          return result
+        end
+      rescue java.sql.SQLException => e
+        result_set.close if result_set
+        stmt.close if stmt
+        @java_rs_data.delete(id) if result && id
+
+        if e.message == 'query does not return ResultSet'
+          return query_no_result_set(sql)
+        else
+          raise e
+        end
+      end
+    end
+  end
+
+  def query_no_result_set(sql)
+    begin
+      stmt = @conn.create_statement
+      stmt.execute(sql)
+      return nil
+    ensure
+      stmt.close if stmt
+    end
+  end
+end

data/lib/baza/jdbc_result.rb

@@ -0,0 +1,125 @@
+# This class controls the result for the Java-MySQL-driver.
+class Baza::JdbcResult < Baza::ResultBase
+  INT_TYPES = {-6 => true, -5 => true, 4 => true, 5 => true}
+  FLOAT_TYPES = {2 => true, 3 => true, 7 => true, 8 => true}
+  TIME_TYPES = {93 => true}
+  DATE_TYPES = {91 => true}
+  STRING_TYPES = {-1 => true, 1 => true, 12 => true}
+  NIL_TYPES = {0 => true}
+
+  # Constructor. This should not be called manually.
+  def initialize(driver, stmt, result_set, preload_results)
+    @result_set = result_set
+    @stmt = stmt
+    @type_translation = driver.baza.opts[:type_translation]
+    @rows = []
+    @index = -1
+    read_results if preload_results
+  end
+
+  def fetch
+    if @read_results
+      return false if @rows.empty?
+      row = @rows.shift
+    else
+      return read_row
+    end
+  end
+
+  def each
+    while data = fetch
+      yield data
+    end
+  end
+
+private
+
+  # Reads meta-data about the query like keys and count.
+  def read_meta
+    @result_set.before_first
+    meta = @result_set.meta_data
+    @count = meta.column_count
+
+    @keys = []
+
+    if @type_translation == true
+      @types = []
+      @type_names = []
+    end
+
+    1.upto(@count) do |count|
+      @keys << meta.column_label(count).to_sym
+
+      if @type_translation == true
+        @types << meta.column_type(count)
+        @type_names << meta.column_type_name(count).downcase.to_sym
+      end
+    end
+  end
+
+  def read_results
+    @read_results = true
+
+    loop do
+      if row = read_row
+        @rows << row
+      else
+        break
+      end
+    end
+  end
+
+  def destroy
+    @stmt.close
+    @result_set.close
+  end
+
+  def read_row
+    return false unless @result_set
+
+    unless @result_set.next
+      destroy
+      @result_set = nil
+      return false
+    end
+
+    read_meta unless @keys
+
+    hash = {}
+    @count.times do |count|
+      if @type_translation
+        value = translate_type(@result_set, count)
+      else
+        value = @result_set.object(count + 1)
+      end
+
+      hash[@keys[count]] = value
+    end
+
+    return hash
+  end
+
+  def translate_type(result, count)
+    java_count = count + 1
+
+    return result.string(java_count) if @type_translation == :string
+
+    type = @types[count]
+
+    if INT_TYPES[type]
+      return result.int(java_count)
+    elsif STRING_TYPES[type]
+      return result.string(java_count)
+    elsif FLOAT_TYPES[type]
+      return result.float(java_count)
+    elsif TIME_TYPES[type] || @type_names[count] == :datetime # Important to do both in SQLite...
+      return Time.parse(result.string(java_count))
+    elsif DATE_TYPES[type]
+      return Date.parse(result.string(java_count))
+    elsif NIL_TYPES[type]
+      return nil
+    else
+      return result.object(java_count)
+    end
+  end
+end

data/{include → lib/baza}/model.rb

@@ -1,7 +1,7 @@
 #This class helps create models in a framework with Baza::Db and Baza::ModelHandler.
 #===Examples
-#  db = Baza::Db.new(:type => "sqlite3", :path => "somepath.sqlite3")
-#  ob = Baza::ModelHandler.new(:db => db, :datarow => true, :path => "path_of_model_class_files")
+#  db = Baza::Db.new(type: :sqlite3, path: "somepath.sqlite3")
+#  ob = Baza::ModelHandler.new(db: db, datarow: true, path: "path_of_model_class_files")
 #  user = ob.get(:User, 1) #=> <Models::User> that extends <Baza::Datarow>
 class Baza::Model
   @@refs = {}

data/{include → lib/baza}/model_handler.rb

@@ -470,7 +470,7 @@ class Baza::ModelHandler
 
       if required_data and !required_data.empty?
         required_data.each do |req_data|
-          self.list(args[:class], :cloned_ubuf => true) do |obj|
+          self.list(args[:class]) do |obj|
             puts "Checking #{obj.classname}(#{obj.id}) for required #{req_data[:class]}." if args[:debug]
             id = obj[req_data[:col]]
 

data/{include → lib/baza}/query_buffer.rb

@@ -92,7 +92,7 @@ class Baza::QueryBuffer
     end
   end
 
-  private
+private
 
   #Runs the flush in a thread in the background.
   def flush_async
@@ -144,4 +144,4 @@ class Baza::QueryBuffer
 
     return nil
   end
-end
+end

data/lib/baza/result_base.rb

@@ -0,0 +1,25 @@
+class Baza::ResultBase
+  include Enumerable
+
+  def to_enum
+    @enum ||= Enumerator.new do |y|
+      each do |data|
+        y << data
+      end
+    end
+  end
+
+  def to_a_enum
+    require 'array_enumerator'
+    @a_enum ||= ArrayEnumerator.new(to_enum)
+  end
+
+  def to_a
+    array = []
+    each do |row_data|
+      array << row_data
+    end
+
+    return array
+  end
+end

data/{include → lib/baza}/revision.rb

@@ -1,7 +1,7 @@
 #This class takes a database-schema from a hash and runs it against the database. It then checks that the database matches the given schema.
 #
 #===Examples
-# db = Baza::Db.new(:type => "sqlite3", :path => "test_db.sqlite3")
+# db = Baza::Db.new(type: :sqlite3, path: "test_db.sqlite3")
 # schema = {
 #   "tables" => {
 #     "User" => {

data/shippable.yml

@@ -6,7 +6,9 @@ rvm:
 before_script:
   - sudo apt-get -f install libmysql-java
   - cp spec/info_mysql_shippable.rb spec/info_mysql.rb
-  - cp spec/info_active_record_shippable.rb spec/info_active_record.rb
+  - cp spec/info_mysql2_shippable.rb spec/info_mysql2.rb
+  - cp spec/info_active_record_shippable_mysql.rb spec/info_active_record_mysql.rb
+  - cp spec/info_active_record_shippable_mysql2.rb spec/info_active_record_mysql2.rb
   - mysql -e 'CREATE DATABASE baza;'
 script:
   - CODECLIMATE_REPO_TOKEN=98c06de7271764c9cd7bbde7cee4ddfa0d3e7db4bd9933f17779100276672e5f bundle exec rspec

data/spec/cloner_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe Baza::Cloner do
+  it 'can clone drivers' do
+    require 'info_active_record_mysql'
+    conn = Baza::InfoActiveRecordMysql.connection
+    baza_db = Baza::Cloner.from_active_record_connection(conn[:conn])
+    expect(baza_db.query('SELECT 1 AS test').fetch[:test].to_s).to eq '1'
+  end
+end

data/spec/drivers/active_record_mysql2_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+unless RUBY_PLATFORM == 'java'
+  describe Baza::Driver::ActiveRecord do
+    let(:constant) {
+      name = described_class.name.split("::").last
+      const_name = "InfoActiveRecordMysql2"
+      require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
+      raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+      Baza.const_get(const_name)
+    }
+
+    it_behaves_like "a baza driver"
+    it_should_behave_like "a baza tables driver"
+    it_should_behave_like "a baza columns driver"
+    it_should_behave_like "a baza indexes driver"
+  end
+end

data/spec/drivers/active_record_mysql_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe Baza::Driver::ActiveRecord do
+  let(:constant) {
+    name = described_class.name.split("::").last
+    const_name = "InfoActiveRecordMysql"
+    require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  }
+
+  it_behaves_like "a baza driver"
+  it_should_behave_like "a baza tables driver"
+  it_should_behave_like "a baza columns driver"
+  it_should_behave_like "a baza indexes driver"
+end

data/spec/drivers/active_record_sqlite3_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe Baza::Driver::ActiveRecord do
+  let(:constant) {
+    name = described_class.name.split("::").last
+    const_name = "InfoActiveRecordSqlite3"
+    require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  }
+
+  it_behaves_like "a baza driver"
+  it_should_behave_like "a baza tables driver"
+  it_should_behave_like "a baza columns driver"
+  it_should_behave_like "a baza indexes driver"
+end

data/spec/drivers/mysql2_spec.rb

@@ -0,0 +1,16 @@
+require "spec_helper"
+
+describe Baza::Driver::Mysql2 do
+  let(:constant) do
+    name = described_class.name.split("::").last
+    const_name = "InfoMysql2"
+    require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  end
+
+  it_should_behave_like "a baza driver"
+  it_should_behave_like "a baza tables driver"
+  it_should_behave_like "a baza columns driver"
+  it_should_behave_like "a baza indexes driver"
+end

data/spec/{include/drivers → drivers}/mysql_spec.rb

@@ -1,6 +1,14 @@
 require "spec_helper"
 
-describe Baza::Driver::Mysql do
+describe Baza.const_get(:Driver).const_get(:Mysql) do
+  let(:constant) do
+    name = described_class.name.split("::").last
+    const_name = "InfoMysql"
+    require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  end
+
   it_should_behave_like "a baza driver"
   it_should_behave_like "a baza tables driver"
   it_should_behave_like "a baza columns driver"

data/spec/{include/drivers → drivers}/sqlite3_spec.rb

@@ -1,6 +1,14 @@
 require "spec_helper"
 
 describe Baza::Driver::Sqlite3 do
+  let(:constant) do
+    name = described_class.name.split("::").last
+    const_name = "InfoSqlite3"
+    require "#{File.dirname(__FILE__)}/../#{StringCases.camel_to_snake(const_name)}"
+    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
+    Baza.const_get(const_name)
+  end
+
   it_behaves_like "a baza driver"
   it_should_behave_like "a baza tables driver"
   it_should_behave_like "a baza columns driver"

data/spec/info_active_record_mysql.rb

@@ -0,0 +1,37 @@
+class Baza::InfoActiveRecordMysql
+  attr_reader :db
+
+  def self.connection
+    require "active_record"
+
+    conn_pool = ::ActiveRecord::Base.establish_connection(
+      adapter: "mysql",
+      host: "localhost",
+      database: "baza-test",
+      username: "baza-test",
+      password: "BBH7djRUKzL5nmG3"
+    )
+    conn = conn_pool.connection
+
+    return {pool: conn_pool, conn: conn}
+  end
+
+  def initialize(args = {})
+    @data = Baza::InfoActiveRecordMysql.connection
+
+    @db = Baza::Db.new({
+      type: :active_record,
+      conn: @data[:conn]
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list.each do |name, table|
+      table.drop
+    end
+  end
+
+  def after
+    @db.close
+  end
+end