baza 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd02457700f9360c5cef41f8b101fa297016136e
-  data.tar.gz: 66949e26d04439be674b2cdd908c613753c5e26d
+  metadata.gz: b5f47d6cdffb1dd17d2d21f48fb8f9c6b0839b87
+  data.tar.gz: 23363aeb34337a30ab40ac95a3e2f627e9daa84b
 SHA512:
-  metadata.gz: 13fdc63c67474ad44f1ba5b029046246d9339a5bfff7cdcdfb9761f3ebff42df0599d85f03409be4ed9e947613565dca672e9e0e679b0d5fbc3bda07f2c4c4cb
-  data.tar.gz: 28472e1d5af9ab5763a15f0dd8f3b33761948d167b572f06fa084e17d882eea51c262e3d0acf16cb736fd4824cce2974d2bbd3b7d37c9efffec4ea1cbd009bc7
+  metadata.gz: 5f96d264eb5a7b392e3772e6fe578c24192a2936aaafb2035f60f8347257e73da2be2ec012d840b4cf58e9d780f20054cf995be3f27f8bee52047f5039e690b2
+  data.tar.gz: 5be50aaefdf6c9fcab087547fa054f2ebe4295ee9347403c7b497b9b6e5e16c2bb6f24392a4e4cd27da84104e20dd48785e9d4648709a227f86410728c1d3728

data/Gemfile

@@ -3,11 +3,11 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "datet"
-gem "wref"
-gem "knjrbfw"
-gem "array_enumerator"
-gem "string-cases"
+gem "datet", "~> 0.0.25"
+gem "wref", "~> 0.0.8"
+gem "knjrbfw", "~> 0.0.111"
+gem "array_enumerator", "~> 0.0.7"
+gem "string-cases", "~> 0.0.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -16,8 +16,15 @@ group :development do
   gem "rdoc"
   gem "bundler"
   gem "jeweler"
-  gem "sqlite3"
-  gem "mysql2"
+
+  if RUBY_ENGINE == "jruby"
+    gem "jdbc-sqlite3"
+    gem "activerecord-jdbc-adapter"
+  else
+    gem "sqlite3"
+    gem "mysql2"
+  end
+
   gem "activerecord"
 end
 

data/Gemfile.lock

@@ -16,7 +16,7 @@ GEM
       tzinfo (~> 1.1)
     addressable (2.3.6)
     arel (5.0.1.20140414130214)
-    array_enumerator (0.0.3)
+    array_enumerator (0.0.7)
     builder (3.2.2)
     codeclimate-test-reporter (0.4.1)
       simplecov (>= 0.7.1, < 1.0.0)
@@ -38,7 +38,7 @@ GEM
       oauth2
     hashie (3.3.1)
     highline (1.6.21)
-    http2 (0.0.26)
+    http2 (0.0.30)
       string-cases
     i18n (0.6.11)
     jeweler (2.0.1)
@@ -51,22 +51,24 @@ GEM
       rake
       rdoc
     json (1.8.1)
+    json (1.8.1-java)
     jwt (1.0.0)
-    knjrbfw (0.0.110)
+    knjrbfw (0.0.111)
       datet
       http2
       php4r
       ruby_process
       tsafe
-      wref
+      wref (>= 0.0.8)
     mini_portile (0.6.0)
     minitest (5.4.2)
     multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
+    mysql2 (0.3.18)
     nokogiri (1.6.3.1)
       mini_portile (= 0.6.0)
+    nokogiri (1.6.3.1-java)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
       jwt (~> 1.0)
@@ -93,7 +95,8 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    ruby_process (0.0.9)
+    ruby_process (0.0.13)
+      string-cases
       tsafe
       wref
     simplecov (0.9.1)
@@ -101,29 +104,31 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    sqlite3 (1.3.9)
-    string-cases (0.0.0)
+    sqlite3 (1.3.10)
+    string-cases (0.0.1)
     string-strtr (0.0.3)
     thread_safe (0.3.4)
+    thread_safe (0.3.4-java)
     tsafe (0.0.11)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    wref (0.0.6)
+    wref (0.0.8)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord
-  array_enumerator
+  array_enumerator (~> 0.0.7)
   bundler
   codeclimate-test-reporter
-  datet
+  datet (~> 0.0.25)
   jeweler
-  knjrbfw
+  knjrbfw (~> 0.0.111)
   mysql2
   rdoc
   rspec
   sqlite3
-  string-cases
-  wref
+  string-cases (~> 0.0.1)
+  wref (~> 0.0.8)

data/README.md

@@ -4,7 +4,7 @@
 
 # baza
 
-A database abstraction layer for Ruby.
+A database abstraction layer for Ruby. Also supports JRuby.
 
 ## Installation
 

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/baza.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: baza 0.0.15 ruby lib
+# stub: baza 0.0.16 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza"
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2015-03-17"
+  s.date = "2015-05-27"
   s.description = "A database abstraction layer, model framework and database framework."
   s.email = "kj@gfish.com"
   s.extra_rdoc_files = [
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "baza.gemspec",
+    "include/cloner.rb",
+    "include/column.rb",
     "include/db.rb",
     "include/dbtime.rb",
     "include/driver.rb",
@@ -44,8 +46,6 @@ Gem::Specification.new do |s|
     "include/drivers/mysql/mysql_sqlspecs.rb",
     "include/drivers/mysql/mysql_table.rb",
     "include/drivers/mysql/mysql_tables.rb",
-    "include/drivers/sqlite3/libknjdb_java_sqlite3.rb",
-    "include/drivers/sqlite3/libknjdb_sqlite3_ironruby.rb",
     "include/drivers/sqlite3/sqlite3.rb",
     "include/drivers/sqlite3/sqlite3_column.rb",
     "include/drivers/sqlite3/sqlite3_columns.rb",
@@ -58,6 +58,7 @@ Gem::Specification.new do |s|
     "include/drivers/sqlite3/sqlite3_tables.rb",
     "include/dump.rb",
     "include/idquery.rb",
+    "include/index.rb",
     "include/model.rb",
     "include/model_custom.rb",
     "include/model_handler.rb",
@@ -66,8 +67,10 @@ Gem::Specification.new do |s|
     "include/revision.rb",
     "include/row.rb",
     "include/sqlspecs.rb",
+    "include/table.rb",
     "lib/baza.rb",
     "shippable.yml",
+    "spec/include/cloner_spec.rb",
     "spec/include/drivers/active_record_spec.rb",
     "spec/include/drivers/mysql_spec.rb",
     "spec/include/drivers/sqlite3_spec.rb",
@@ -86,18 +89,18 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.0"
+  s.rubygems_version = "2.2.2"
   s.summary = "A database abstraction layer, model framework and database framework."
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<datet>, [">= 0"])
-      s.add_runtime_dependency(%q<wref>, [">= 0"])
-      s.add_runtime_dependency(%q<knjrbfw>, [">= 0"])
-      s.add_runtime_dependency(%q<array_enumerator>, [">= 0"])
-      s.add_runtime_dependency(%q<string-cases>, [">= 0"])
+      s.add_runtime_dependency(%q<datet>, ["~> 0.0.25"])
+      s.add_runtime_dependency(%q<wref>, ["~> 0.0.8"])
+      s.add_runtime_dependency(%q<knjrbfw>, ["~> 0.0.111"])
+      s.add_runtime_dependency(%q<array_enumerator>, ["~> 0.0.7"])
+      s.add_runtime_dependency(%q<string-cases>, ["~> 0.0.1"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
@@ -106,11 +109,11 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<mysql2>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
     else
-      s.add_dependency(%q<datet>, [">= 0"])
-      s.add_dependency(%q<wref>, [">= 0"])
-      s.add_dependency(%q<knjrbfw>, [">= 0"])
-      s.add_dependency(%q<array_enumerator>, [">= 0"])
-      s.add_dependency(%q<string-cases>, [">= 0"])
+      s.add_dependency(%q<datet>, ["~> 0.0.25"])
+      s.add_dependency(%q<wref>, ["~> 0.0.8"])
+      s.add_dependency(%q<knjrbfw>, ["~> 0.0.111"])
+      s.add_dependency(%q<array_enumerator>, ["~> 0.0.7"])
+      s.add_dependency(%q<string-cases>, ["~> 0.0.1"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<rdoc>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
@@ -120,11 +123,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<activerecord>, [">= 0"])
     end
   else
-    s.add_dependency(%q<datet>, [">= 0"])
-    s.add_dependency(%q<wref>, [">= 0"])
-    s.add_dependency(%q<knjrbfw>, [">= 0"])
-    s.add_dependency(%q<array_enumerator>, [">= 0"])
-    s.add_dependency(%q<string-cases>, [">= 0"])
+    s.add_dependency(%q<datet>, ["~> 0.0.25"])
+    s.add_dependency(%q<wref>, ["~> 0.0.8"])
+    s.add_dependency(%q<knjrbfw>, ["~> 0.0.111"])
+    s.add_dependency(%q<array_enumerator>, ["~> 0.0.7"])
+    s.add_dependency(%q<string-cases>, ["~> 0.0.1"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<rdoc>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])

data/include/cloner.rb

@@ -0,0 +1,18 @@
+class Baza::Cloner
+  def self.from_active_record_connection(connection)
+    if connection.class.name.include?('Mysql2Adapter')
+      config = connection.instance_variable_get(:@connection).instance_variable_get(:@query_options)
+
+      Baza::Db.new(
+        type: :mysql,
+        subtype: :mysql2,
+        host: config[:host],
+        user: config[:username],
+        pass: config[:password],
+        db: config[:database]
+      )
+    else
+      raise "Unsupported adapter: #{connection.class.name}"
+    end
+  end
+end

data/include/column.rb

@@ -0,0 +1,9 @@
+class Baza::Column
+  def to_s
+    "#<#{self.class.name} name=\"#{name}\" type=\"#{type}\" maxlength=\"#{maxlength}\" autoincr=\"#{autoincr?}\" primarykey=\"#{primarykey?}\">"
+  end
+
+  def inspect
+    to_s
+  end
+end

data/include/db.rb

@@ -97,9 +97,9 @@ class Baza::Db
     end
 
     if RUBY_PLATFORM == "java"
-      @opts[:subtype] = "java"
+      @opts[:subtype] ||= :java
     elsif @opts[:type] == "sqlite3" && RUBY_PLATFORM.index("mswin32") != nil
-      @opts[:subtype] = "ironruby"
+      @opts[:subtype] ||= :ironruby
     end
 
     @type_cc = StringCases.snake_to_camel(@opts[:type])

data/include/drivers/active_record/active_record.rb

@@ -90,8 +90,8 @@ class Baza::Driver::ActiveRecord::Result
 
   def enum
     @enum ||= Enumerator.new do |y|
-      @res.each(as: :hash) do |result|
-        y << result.symbolize_keys
+      each do |data|
+        y << data
       end
     end
   end
@@ -104,8 +104,18 @@ class Baza::Driver::ActiveRecord::Result
     end
   end
 
-  def each &blk
-    enum.each &blk
+  def each(&blk)
+    return unless @res
+
+    if RUBY_ENGINE == "jruby"
+      @res.each do |result|
+        yield result.symbolize_keys
+      end
+    else
+      @res.each(as: :hash) do |result|
+        yield result.symbolize_keys
+      end
+    end
   end
 end
 

data/include/drivers/mysql/mysql.rb

@@ -29,14 +29,27 @@ class Baza::Driver::Mysql
           }
         }
       }
+    elsif args[:object].class.name == "Java::ComMysqlJdbc::JDBC4Connection"
+      return {
+        type: :success,
+        args: {
+          type: :mysql,
+          subtype: :java,
+          conn: args[:object],
+          query_args: {
+            as: :hash,
+            symbolize_keys: true
+          }
+        }
+      }
     end
 
     return nil
   end
 
-  def initialize(baza_db_obj)
-    @baza_db = baza_db_obj
-    @opts = @baza_db.opts
+  def initialize(baza)
+    @baza = baza
+    @opts = @baza.opts
     @sep_table = "`"
     @sep_col = "`"
     @sep_val = "'"
@@ -50,22 +63,22 @@ class Baza::Driver::Mysql
       @encoding = "utf8"
     end
 
-    if @baza_db.opts.key?(:port)
-      @port = @baza_db.opts[:port].to_i
+    if @baza.opts.key?(:port)
+      @port = @baza.opts[:port].to_i
     else
       @port = 3306
     end
 
     @java_rs_data = {}
-    @subtype = @baza_db.opts[:subtype]
-    @subtype = :mysql if @subtype.to_s.empty?
-    self.reconnect
+    @subtype = @baza.opts[:subtype]
+    @subtype ||= :mysql
+    reconnect
   end
 
   #This method handels the closing of statements and results for the Java MySQL-mode.
   def java_mysql_resultset_killer(id)
     data = @java_rs_data[id]
-    return nil if !data
+    return nil unless data
 
     data[:res].close
     data[:stmt].close
@@ -74,7 +87,7 @@ class Baza::Driver::Mysql
 
   #Cleans the wref-map holding the tables.
   def clean
-    self.tables.clean if self.tables
+    tables.clean if tables
   end
 
   #Respawns the connection to the MySQL-database.
@@ -82,16 +95,16 @@ class Baza::Driver::Mysql
     @mutex.synchronize do
       case @subtype
         when :mysql
-          @conn = Mysql.real_connect(@baza_db.opts[:host], @baza_db.opts[:user], @baza_db.opts[:pass], @baza_db.opts[:db], @port)
+          @conn = Mysql.real_connect(@baza.opts[:host], @baza.opts[:user], @baza.opts[:pass], @baza.opts[:db], @port)
         when :mysql2
           require "rubygems"
           require "mysql2"
 
           args = {
-            host: @baza_db.opts[:host],
-            username: @baza_db.opts[:user],
-            password: @baza_db.opts[:pass],
-            database: @baza_db.opts[:db],
+            host: @baza.opts[:host],
+            username: @baza.opts[:user],
+            password: @baza.opts[:pass],
+            database: @baza.opts[:db],
             port: @port,
             symbolize_keys: true,
             cache_rows: false
@@ -99,11 +112,11 @@ class Baza::Driver::Mysql
 
           #Symbolize keys should also be given here, else table-data wont be symbolized for some reason - knj.
           @query_args = {symbolize_keys: true}
-          @query_args.merge!(@baza_db.opts[:query_args]) if @baza_db.opts[:query_args]
+          @query_args.merge!(@baza.opts[:query_args]) if @baza.opts[:query_args]
 
           pos_args = [:as, :async, :cast_booleans, :database_timezone, :application_timezone, :cache_rows, :connect_flags, :cast]
           pos_args.each do |key|
-            args[key] = @baza_db.opts[key] if @baza_db.opts.key?(key)
+            args[key] = @baza.opts[key] if @baza.opts.key?(key)
           end
 
           args[:as] = :array if @opts[:result] == "array"
@@ -111,8 +124,8 @@ class Baza::Driver::Mysql
           tries = 0
           begin
             tries += 1
-            if @baza_db.opts[:conn]
-              @conn = @baza_db.opts[:conn]
+            if @baza.opts[:conn]
+              @conn = @baza.opts[:conn]
             else
               @conn = Mysql2::Client.new(args)
             end
@@ -128,14 +141,20 @@ class Baza::Driver::Mysql
             raise e
           end
         when :java
-          unless @jdbc_loaded
-            require "java"
-            require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
-            import "com.mysql.jdbc.Driver"
+          if @baza.opts[:conn]
             @jdbc_loaded = true
+            @conn = @baza.opts[:conn]
+          else
+            unless @jdbc_loaded
+              require "java"
+              require "/usr/share/java/mysql-connector-java.jar" if File.exists?("/usr/share/java/mysql-connector-java.jar")
+              import "com.mysql.jdbc.Driver"
+              @jdbc_loaded = true
+            end
+
+            @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@baza.opts[:host]}:#{@port}/#{@baza.opts[:db]}?user=#{@baza.opts[:user]}&password=#{@baza.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}&holdResultsOpenOverStatementClose=true")
           end
 
-          @conn = java.sql::DriverManager.getConnection("jdbc:mysql://#{@baza_db.opts[:host]}:#{@port}/#{@baza_db.opts[:db]}?user=#{@baza_db.opts[:user]}&password=#{@baza_db.opts[:pass]}&populateInsertRowWithDefaultValues=true&zeroDateTimeBehavior=round&characterEncoding=#{@encoding}&holdResultsOpenOverStatementClose=true")
           query("SET SQL_MODE = ''")
         else
           raise "Unknown subtype: #{@subtype} (#{@subtype.class.name})"
@@ -162,7 +181,7 @@ class Baza::Driver::Mysql
           when :java
             stmt = conn.create_statement
 
-            if str.match(/^\s*(delete|update|create|drop|insert\s+into|alter)\s+/i)
+            if str.match(/^\s*(delete|update|create|drop|insert\s+into|alter|truncate)\s+/i)
               begin
                 stmt.execute(str)
               ensure
@@ -175,7 +194,7 @@ class Baza::Driver::Mysql
 
               begin
                 res = stmt.execute_query(str)
-                ret = Baza::Driver::Mysql::ResultJava.new(@baza_db, @opts, res)
+                ret = Baza::Driver::Mysql::ResultJava.new(@baza, @opts, res)
                 id = ret.__id__
 
                 #If ID is being reused we have to free the result.
@@ -189,7 +208,8 @@ class Baza::Driver::Mysql
               rescue => e
                 res.close if res
                 stmt.close
-                @java_rs_data.delete(id) if ret and id
+                @java_rs_data.delete(id) if ret && id
+
                 raise e
               end
             end
@@ -221,7 +241,7 @@ class Baza::Driver::Mysql
           @conn.query_with_result = false
           return Baza::Driver::Mysql::ResultUnbuffered.new(@conn, @opts, @conn.query(str))
         when :mysql2
-          return Baza::Driver::Mysql::ResultMySQL2.new(@conn.query(str, @query_args.merge(:stream => true)))
+          return Baza::Driver::Mysql::ResultMysql2.new(@conn.query(str, @query_args.merge(stream: true)))
         when :java
           if str.match(/^\s*(delete|update|create|drop|insert\s+into)\s+/i)
             stmt = @conn.createStatement
@@ -239,7 +259,7 @@ class Baza::Driver::Mysql
 
             begin
               res = stmt.executeQuery(str)
-              ret = Baza::Driver::Mysql::ResultJava.new(@baza_db, @opts, res)
+              ret = Baza::Driver::Mysql::ResultJava.new(@baza, @opts, res)
 
               #Save reference to result and statement, so we can close them when they are garbage collected.
               @java_rs_data[ret.__id__] = {res: res, stmt: stmt}
@@ -323,7 +343,7 @@ class Baza::Driver::Mysql
   #Destroyes the connection.
   def destroy
     @conn = nil
-    @baza_db = nil
+    @baza = nil
     @mutex = nil
     @subtype = nil
     @encoding = nil
@@ -369,7 +389,7 @@ class Baza::Driver::Mysql
             sql << ","
           end
 
-          sql << @baza_db.sqlval(val)
+          sql << @baza.sqlval(val)
         end
       else
         hash.each do |key, val|
@@ -379,7 +399,7 @@ class Baza::Driver::Mysql
             sql << ","
           end
 
-          sql << @baza_db.sqlval(val)
+          sql << @baza.sqlval(val)
         end
       end
     end
@@ -410,13 +430,13 @@ class Baza::Driver::Mysql
 
   #Starts a transaction, yields the database and commits at the end.
   def transaction
-    @baza_db.q("START TRANSACTION")
+    @baza.q("START TRANSACTION")
 
     begin
-      yield @baza_db
-      @baza_db.q("COMMIT")
+      yield @baza
+      @baza.q("COMMIT")
     rescue
-      @baza_db.q("ROLLBACK")
+      @baza.q("ROLLBACK")
       raise
     end
   end