baza 0.0.17 → 0.0.18

data/spec/spec_helper.rb

@@ -3,6 +3,14 @@ CodeClimate::TestReporter.start
 
 require 'baza'
 
+if RUBY_PLATFORM == 'java'
+  require 'jdbc/mysql'
+  ::Jdbc::MySQL.load_driver
+
+  require 'jdbc/sqlite3'
+  ::Jdbc::SQLite3.load_driver
+end
+
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |config|

data/spec/support/driver_collection.rb

@@ -1,24 +1,24 @@
 shared_examples_for "a baza driver" do
-  let(:constant){
-    name = described_class.name.split("::").last
-    const_name = "Info#{name.slice(0, 1).upcase}#{name.slice(1, name.length)}"
-    require "#{File.dirname(__FILE__)}/../info_#{StringCases.camel_to_snake(name)}"
-    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
-    Baza.const_get(const_name)
-  }
-  let(:driver){ constant.new }
-  let(:driver2){ constant.new }
-  let(:db){ driver.db }
-  let(:db2){ driver2.db }
-  let(:test_table){
+  let(:driver) { constant.new(type_translation: :string) }
+  let(:driver2) { constant.new }
+  let(:db) { driver.db }
+  let(:db2) { driver2.db }
+  let(:db_with_type_translation) { constant.new(type_translation: true, debug: false).db }
+  let(:row) do
+    test_table.insert(text: 'Kasper', number: 30, float: 4.5)
+    db.select(:test, text: 'Kasper').fetch
+  end
+  let(:test_table) do
     db.tables.create("test", {
       columns: [
-        {name: "id", type: :int, autoincr: true, primarykey: true},
-        {name: "text", type: :varchar}
+        {name: 'id', type: :int, autoincr: true, primarykey: true},
+        {name: 'text', type: :varchar},
+        {name: 'number', type: :int, default: 0},
+        {name: 'float', type: :float, default: 0.0}
       ]
     })
     db.tables[:test]
-  }
+  end
 
   before do
     driver.before
@@ -88,6 +88,22 @@ shared_examples_for "a baza driver" do
     raise "Block with should have ran too little: #{block_ran}." if block_ran < rows_count
   end
 
+  it 'does unbuffered queries' do
+    test_table
+
+    10.times do |count|
+      db.insert(:test, text: "Test #{count}")
+    end
+
+    count_results = 0
+    db.q("SELECT * FROM test", type: :unbuffered) do |row|
+      expect(row[:text]).to eq "Test #{count_results}"
+      count_results += 1
+    end
+
+    expect(count_results).to eq 10
+  end
+
   it "should do upserting" do
     test_table.create_columns([{name: "nickname", type: :varchar}])
 
@@ -181,7 +197,10 @@ shared_examples_for "a baza driver" do
   end
 
   it "should be able to make new connections based on given objects" do
-    new_db = Baza::Db.from_object(:object => db.conn.conn)
+    # Mysql doesn't support it...
+    unless db.opts.fetch(:type) == :mysql
+      new_db = Baza::Db.from_object(object: db.conn.conn)
+    end
   end
 
   it "should be able to do ID-queries through the select-method" do
@@ -204,51 +223,56 @@ shared_examples_for "a baza driver" do
     end
 
     count_found = 0
-    db.select(:test_table, nil, :idquery => :idrow) do |row|
+    db.select(:test_table, nil, idquery: :idrow) do |row|
       count_found += 1
 
       row[:name].should eq "Kasper #{count_found}"
     end
 
-    count_found.should eq 10000
+    expect(count_found).to eq 10000
   end
 
   it "should be able to use query buffers" do
     db.tables.create(:test_table, {
-      :columns => [
-        {:name => :id, :type => :int, :autoincr => true, :primarykey => true},
-        {:name => :name, :type => :varchar}
+      columns: [
+        {name: :id, type: :int, autoincr: true, primarykey: true},
+        {name: :name, type: :varchar}
       ]
     })
 
     upsert = false
+    count_inserts = 0
     db.q_buffer do |buffer|
       2500.times do |count|
         if upsert
-          buffer.upsert(:test_table, {:name => "Kasper #{count}"}, {:name => "Kasper #{count}"})
+          buffer.upsert(:test_table, {name: "Kasper #{count}"}, {name: "Kasper #{count}"})
           upsert = false
         else
-          buffer.insert(:test_table, {:name => "Kasper #{count}"})
+          buffer.insert(:test_table, {name: "Kasper #{count}"})
           upsert = true
         end
+
+        count_inserts += 1
       end
     end
 
+    expect(count_inserts).to eq 2500
+
     test_table = db.tables[:test_table]
-    test_table.rows_count.should eql(2500)
+    expect(test_table.rows_count).to eq 2500
 
+    count = 0
     db.q_buffer do |buffer|
-      count = 0
       upsert = false
 
-      db.select(:test_table, {}, :orderby => :id) do |row|
-        row[:name].should eql("Kasper #{count}")
+      db.select(:test_table, {}, orderby: :id) do |row|
+        expect(row[:name]).to eq "Kasper #{count}"
 
         if upsert
-          buffer.upsert(:test_table, {name: "Kasper #{count}-#{count}"}, {id: row[:id]})
+          buffer.upsert(:test_table, {name: "Kasper #{count}-#{count}"}, id: row.fetch(:id))
           upsert = false
         else
-          buffer.update(:test_table, {name: "Kasper #{count}-#{count}"}, {id: row[:id]})
+          buffer.update(:test_table, {name: "Kasper #{count}-#{count}"}, id: row.fetch(:id))
           upsert = true
         end
 
@@ -256,14 +280,18 @@ shared_examples_for "a baza driver" do
       end
     end
 
+    expect(count).to eq 2500
+
     count = 0
-    db.select(:test_table, {}, :orderby => :id) do |row|
-      row[:name].should eq "Kasper #{count}-#{count}"
+    db.select(:test_table, {}, orderby: :id) do |row|
+      expect(row[:name]).to eq "Kasper #{count}-#{count}"
       count += 1
     end
 
+    expect(count).to eq 2500
+
     #Test the flush-async which flushes transactions in a thread asyncronous.
-    db.q_buffer(:flush_async => true) do |buffer|
+    db.q_buffer(flush_async: true) do |buffer|
       count = 0
       db.select(:test_table) do |row|
         count += 1
@@ -272,7 +300,7 @@ shared_examples_for "a baza driver" do
           time_start = Time.now.to_f
         end
 
-        buffer.delete(:test_table, {:id => row[:id]})
+        buffer.delete(:test_table, id: row[:id])
 
         if count == 1000
           time_end = Time.now.to_f
@@ -283,6 +311,68 @@ shared_examples_for "a baza driver" do
       end
     end
 
-    test_table.rows_count.should eql(0)
+    expect(test_table.rows_count).to eq 0
+  end
+
+  describe 'results' do
+    before do
+      test_table.insert(text: 'test 1')
+      test_table.insert(text: 'test 2')
+    end
+
+    it '#to_a' do
+      array = db.select(:test).to_a
+      expect(array.length).to eq 2
+    end
+
+    it '#to_a_enum' do
+      array_enum = db.select(:test).to_a_enum
+      count = 0
+      array_enum.each { count += 1 }
+      expect(count).to eq 2
+      expect(array_enum.length).to eq 2
+    end
+
+    it '#to_enum' do
+      enum = db.select(:test).to_enum
+
+      count = 0
+      enum.each { count += 1 }
+      expect(count).to eq 2
+    end
+  end
+
+  it 'counts' do
+    test_table.insert(text: 'test 1')
+    expect(db.count(:test, text: 'test 1')).to eq 1
+  end
+
+  it 'doesnt do type translation by default' do
+    expect(row.fetch(:text).class).to eq String
+    expect(row.fetch(:number).class).to eq String
+    expect(row.fetch(:float).class).to eq String
+  end
+
+  it 'does type translation' do
+    db_with_type_translation.tables.create(:test, {
+      columns: [
+        {name: "id", type: :int, autoincr: true, primarykey: true},
+        {name: "text", type: :varchar},
+        {name: 'number', type: :int},
+        {name: 'float', type: :float},
+        {name: 'created_at', type: :datetime},
+        {name: 'date', type: :date}
+      ]
+    })
+
+    db_with_type_translation.insert(:test, text: 'Kasper', number: 30, float: 4.5, created_at: Time.now, date: Date.new(2015, 06, 17))
+
+    row = db_with_type_translation.select(:test, text: 'Kasper').fetch
+
+    expect(row.fetch(:text).class).to eq String
+    expect(row.fetch(:number).class).to eq Fixnum
+    expect(row.fetch(:float).class).to eq Float
+    expect(row.fetch(:created_at).class).to eq Time
+    expect(row.fetch(:date).class).to eq Date
   end
 end

data/spec/support/driver_columns_collection.rb

@@ -1,11 +1,4 @@
 shared_examples_for "a baza columns driver" do
-  let(:constant){
-    name = described_class.name.split("::").last
-    const_name = "Info#{name.slice(0, 1).upcase}#{name.slice(1, name.length)}"
-    require "#{File.dirname(__FILE__)}/../info_#{StringCases.camel_to_snake(name)}"
-    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
-    Baza.const_get(const_name)
-  }
   let(:driver){ constant.new }
   let(:db){ driver.db }
   let(:test_table){

data/spec/support/driver_indexes_collection.rb

@@ -1,14 +1,7 @@
 shared_examples_for "a baza indexes driver" do
-  let(:constant){
-    name = described_class.name.split("::").last
-    const_name = "Info#{name.slice(0, 1).upcase}#{name.slice(1, name.length)}"
-    require "#{File.dirname(__FILE__)}/../info_#{StringCases.camel_to_snake(name)}"
-    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
-    Baza.const_get(const_name)
-  }
-  let(:driver){ constant.new }
-  let(:db){ driver.db }
-  let(:test_table){
+  let(:driver) { constant.new }
+  let(:db) { driver.db }
+  let(:test_table) do
     db.tables.create("test", {
       columns: [
         {name: "id", type: :int, autoincr: true, primarykey: true},
@@ -21,7 +14,7 @@ shared_examples_for "a baza indexes driver" do
       ]
     })
     db.tables[:test]
-  }
+  end
 
   before do
     driver.before

data/spec/support/driver_tables_collection.rb

@@ -1,11 +1,4 @@
 shared_examples_for "a baza tables driver" do
-  let(:constant){
-    name = described_class.name.split("::").last
-    const_name = "Info#{name.slice(0, 1).upcase}#{name.slice(1, name.length)}"
-    require "#{File.dirname(__FILE__)}/../info_#{StringCases.camel_to_snake(name)}"
-    raise "Constant was not defined: '#{const_name}'." unless Baza.const_defined?(const_name)
-    Baza.const_get(const_name)
-  }
   let(:driver){ constant.new }
   let(:driver2){ constant.new }
   let(:db){ driver.db }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: datet
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: string-cases
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +136,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jdbc-sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jdbc-mysql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-jdbc-adapter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -195,56 +265,94 @@ files:
 - Rakefile
 - VERSION
 - baza.gemspec
-- include/cloner.rb
-- include/column.rb
-- include/db.rb
-- include/dbtime.rb
-- include/driver.rb
-- include/drivers/active_record/active_record.rb
-- include/drivers/mysql/mysql.rb
-- include/drivers/mysql/mysql_column.rb
-- include/drivers/mysql/mysql_columns.rb
-- include/drivers/mysql/mysql_index.rb
-- include/drivers/mysql/mysql_indexes.rb
-- include/drivers/mysql/mysql_result.rb
-- include/drivers/mysql/mysql_result_java.rb
-- include/drivers/mysql/mysql_result_mysql2.rb
-- include/drivers/mysql/mysql_result_unbuffered.rb
-- include/drivers/mysql/mysql_sqlspecs.rb
-- include/drivers/mysql/mysql_table.rb
-- include/drivers/mysql/mysql_tables.rb
-- include/drivers/sqlite3/sqlite3.rb
-- include/drivers/sqlite3/sqlite3_column.rb
-- include/drivers/sqlite3/sqlite3_columns.rb
-- include/drivers/sqlite3/sqlite3_index.rb
-- include/drivers/sqlite3/sqlite3_indexes.rb
-- include/drivers/sqlite3/sqlite3_result.rb
-- include/drivers/sqlite3/sqlite3_result_java.rb
-- include/drivers/sqlite3/sqlite3_sqlspecs.rb
-- include/drivers/sqlite3/sqlite3_table.rb
-- include/drivers/sqlite3/sqlite3_tables.rb
-- include/dump.rb
-- include/errors.rb
-- include/idquery.rb
-- include/index.rb
-- include/model.rb
-- include/model_custom.rb
-- include/model_handler.rb
-- include/model_handler_sqlhelper.rb
-- include/query_buffer.rb
-- include/revision.rb
-- include/row.rb
-- include/sqlspecs.rb
-- include/table.rb
 - lib/baza.rb
+- lib/baza/base_sql_driver.rb
+- lib/baza/cloner.rb
+- lib/baza/column.rb
+- lib/baza/db.rb
+- lib/baza/dbtime.rb
+- lib/baza/driver.rb
+- lib/baza/drivers/active_record.rb
+- lib/baza/drivers/active_record/columns.rb
+- lib/baza/drivers/active_record/indexes.rb
+- lib/baza/drivers/active_record/result.rb
+- lib/baza/drivers/active_record/tables.rb
+- lib/baza/drivers/mysql.rb
+- lib/baza/drivers/mysql/column.rb
+- lib/baza/drivers/mysql/columns.rb
+- lib/baza/drivers/mysql/index.rb
+- lib/baza/drivers/mysql/indexes.rb
+- lib/baza/drivers/mysql/result.rb
+- lib/baza/drivers/mysql/sqlspecs.rb
+- lib/baza/drivers/mysql/table.rb
+- lib/baza/drivers/mysql/tables.rb
+- lib/baza/drivers/mysql/unbuffered_result.rb
+- lib/baza/drivers/mysql2.rb
+- lib/baza/drivers/mysql2/column.rb
+- lib/baza/drivers/mysql2/columns.rb
+- lib/baza/drivers/mysql2/index.rb
+- lib/baza/drivers/mysql2/indexes.rb
+- lib/baza/drivers/mysql2/result.rb
+- lib/baza/drivers/mysql2/table.rb
+- lib/baza/drivers/mysql2/tables.rb
+- lib/baza/drivers/mysql_java.rb
+- lib/baza/drivers/mysql_java/column.rb
+- lib/baza/drivers/mysql_java/columns.rb
+- lib/baza/drivers/mysql_java/index.rb
+- lib/baza/drivers/mysql_java/indexes.rb
+- lib/baza/drivers/mysql_java/table.rb
+- lib/baza/drivers/mysql_java/tables.rb
+- lib/baza/drivers/sqlite3.rb
+- lib/baza/drivers/sqlite3/column.rb
+- lib/baza/drivers/sqlite3/columns.rb
+- lib/baza/drivers/sqlite3/index.rb
+- lib/baza/drivers/sqlite3/indexes.rb
+- lib/baza/drivers/sqlite3/result.rb
+- lib/baza/drivers/sqlite3/sqlspecs.rb
+- lib/baza/drivers/sqlite3/table.rb
+- lib/baza/drivers/sqlite3/tables.rb
+- lib/baza/drivers/sqlite3/unbuffered_result.rb
+- lib/baza/drivers/sqlite3_java.rb
+- lib/baza/drivers/sqlite3_java/column.rb
+- lib/baza/drivers/sqlite3_java/columns.rb
+- lib/baza/drivers/sqlite3_java/index.rb
+- lib/baza/drivers/sqlite3_java/indexes.rb
+- lib/baza/drivers/sqlite3_java/table.rb
+- lib/baza/drivers/sqlite3_java/tables.rb
+- lib/baza/drivers/sqlite3_java/unbuffered_result.rb
+- lib/baza/drivers/sqlite3_rhodes.rb
+- lib/baza/dump.rb
+- lib/baza/errors.rb
+- lib/baza/idquery.rb
+- lib/baza/index.rb
+- lib/baza/jdbc_driver.rb
+- lib/baza/jdbc_result.rb
+- lib/baza/model.rb
+- lib/baza/model_custom.rb
+- lib/baza/model_handler.rb
+- lib/baza/model_handler_sqlhelper.rb
+- lib/baza/query_buffer.rb
+- lib/baza/result_base.rb
+- lib/baza/revision.rb
+- lib/baza/row.rb
+- lib/baza/sqlspecs.rb
+- lib/baza/table.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
-- spec/info_active_record.rb
+- spec/cloner_spec.rb
+- spec/drivers/active_record_mysql2_spec.rb
+- spec/drivers/active_record_mysql_spec.rb
+- spec/drivers/active_record_sqlite3_spec.rb
+- spec/drivers/mysql2_spec.rb
+- spec/drivers/mysql_spec.rb
+- spec/drivers/sqlite3_spec.rb
 - spec/info_active_record_example.rb
-- spec/info_active_record_shippable.rb
+- spec/info_active_record_mysql.rb
+- spec/info_active_record_mysql2.rb
+- spec/info_active_record_mysql2_shippable.rb
+- spec/info_active_record_mysql_shippable.rb
+- spec/info_active_record_sqlite3.rb
+- spec/info_mysql2_example.rb
+- spec/info_mysql2_shippable.rb
 - spec/info_mysql_example.rb
 - spec/info_mysql_shippable.rb
 - spec/info_sqlite3.rb
@@ -274,7 +382,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.0
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.