baza 0.0.20 → 0.0.21

data/spec/drivers/pg_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+unless RUBY_PLATFORM == "java"
+  describe Baza.const_get(:Driver).const_get(:Pg) do
+    let(:constant) do
+      const_name = "InfoPg"
+      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 databases 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/sqlite3_spec.rb

@@ -2,7 +2,6 @@ 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)
@@ -37,16 +36,16 @@ describe Baza::Driver::Sqlite3 do
       table1.insert(testname: "TestRow#{count}")
     end
 
-    expect { table2 = db2.tables[:test_table] }.to raise_error(Baza::Errors::TableNotFound)
+    expect { db2.tables[:test_table] }.to raise_error(Baza::Errors::TableNotFound)
 
     db.copy_to(db2)
 
     table2 = db2.tables[:test_table]
 
     cols2 = table2.columns
-    cols2.length.should eql(cols1.length)
+    expect(cols2.length).to eql(cols1.length)
 
-    table2.rows_count.should eql(table1.rows_count)
+    expect(table2.rows_count).to eq table1.rows_count
 
     db.select(:test_table) do |row1|
       found = 0
@@ -54,14 +53,14 @@ describe Baza::Driver::Sqlite3 do
         found += 1
 
         row1.each do |key, val|
-          row2[key].should eql(val)
+          expect(row2[key]).to eql(val)
         end
       end
 
-      found.should eq 1
+      expect(found).to eq 1
     end
 
-    table1.indexes.length.should eq 1
-    table2.indexes.length.should eq table1.indexes.length
+    expect(table1.indexes.length).to eq 1
+    expect(table2.indexes.length).to eq table1.indexes.length
   end
 end

data/spec/info_active_record_example.rb

@@ -21,7 +21,7 @@ class Baza::InfoActiveRecord
 
     @db = Baza::Db.new({
       type: :active_record,
-      conn: data[:conn]
+      conn: data.fetch(:conn)
     }.merge(args))
   end
 

data/spec/{info_active_record_mysql2.rb → info_active_record_mysql2_example.rb}

@@ -3,13 +3,14 @@ class Baza::InfoActiveRecordMysql2
 
   def self.connection
     require "active_record"
+    require "activerecord-jdbc-adapter" if RUBY_PLATFORM == "java"
 
     @conn_pool ||= ::ActiveRecord::Base.establish_connection(
       adapter: "mysql2",
       host: "localhost",
       database: "baza-test",
       username: "baza-test",
-      password: "BBH7djRUKzL5nmG3"
+      password: "password"
     )
     @conn ||= @conn_pool.connection
 
@@ -21,7 +22,7 @@ class Baza::InfoActiveRecordMysql2
 
     @db = Baza::Db.new({
       type: :active_record,
-      conn: data[:conn]
+      conn: data.fetch(:conn)
     }.merge(args))
   end
 

data/spec/info_active_record_mysql2_travis.rb

@@ -0,0 +1,35 @@
+class Baza::InfoActiveRecordMysql2
+  attr_reader :db
+
+  def self.connection
+    require "active_record"
+    require "activerecord-jdbc-adapter" if RUBY_PLATFORM == "java"
+
+    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+      adapter: "mysql2",
+      host: "localhost",
+      database: "baza",
+      username: "travis"
+    )
+    @conn = @conn_pool.connection
+
+    {pool: @conn_pool, conn: @conn}
+  end
+
+  def initialize(args = {})
+    data = Baza::InfoActiveRecordMysql2.connection
+
+    @db = Baza::Db.new({
+      type: :active_record,
+      conn: data.fetch(:conn)
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list(&:drop)
+  end
+
+  def after
+    @db.close
+  end
+end

data/spec/{info_active_record_mysql.rb → info_active_record_mysql_example.rb}

@@ -3,13 +3,14 @@ class Baza::InfoActiveRecordMysql
 
   def self.connection
     require "active_record"
+    require "activerecord-jdbc-adapter" if RUBY_PLATFORM == "java"
 
     @conn_pool ||= ::ActiveRecord::Base.establish_connection(
       adapter: "mysql",
       host: "localhost",
       database: "baza-test",
       username: "baza-test",
-      password: "BBH7djRUKzL5nmG3"
+      password: "password"
     )
     @conn ||= @conn_pool.connection
 
@@ -17,12 +18,12 @@ class Baza::InfoActiveRecordMysql
   end
 
   def initialize(args = {})
-    @data = Baza::InfoActiveRecordMysql.connection
-    @data.fetch(:conn).reconnect!
+    data = Baza::InfoActiveRecordMysql.connection
+    data.fetch(:conn).reconnect!
 
     @db = Baza::Db.new({
       type: :active_record,
-      conn: @data.fetch(:conn)
+      conn: data.fetch(:conn)
     }.merge(args))
   end
 

data/spec/info_active_record_mysql_travis.rb

@@ -0,0 +1,36 @@
+class Baza::InfoActiveRecordMysql
+  attr_reader :db
+
+  def self.connection
+    require "active_record"
+    require "activerecord-jdbc-adapter" if RUBY_PLATFORM == "java"
+
+    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+      adapter: "mysql",
+      host: "localhost",
+      database: "baza",
+      username: "travis"
+    )
+    @conn ||= @conn_pool.connection
+
+    {pool: @conn_pool, conn: @conn}
+  end
+
+  def initialize(args = {})
+    data = Baza::InfoActiveRecordMysql.connection
+    data.fetch(:conn).reconnect!
+
+    @db = Baza::Db.new({
+      type: :active_record,
+      conn: data.fetch(:conn)
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list(&:drop)
+  end
+
+  def after
+    @db.close
+  end
+end

data/spec/info_active_record_pg_example.rb

@@ -0,0 +1,36 @@
+class Baza::InfoActiveRecordPg
+  attr_reader :db
+
+  def self.connection
+    require "active_record"
+    require "pg"
+
+    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+      adapter: "postgresql",
+      host: "localhost",
+      database: "baza-test",
+      username: "baza-test",
+      password: "password"
+    )
+    @conn ||= @conn_pool.connection
+
+    {pool: @conn_pool, conn: @conn}
+  end
+
+  def initialize(args = {})
+    data = Baza::InfoActiveRecordPg.connection
+
+    @db = Baza::Db.new({
+      type: :active_record,
+      conn: data.fetch(:conn)
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list(&:drop)
+  end
+
+  def after
+    @db.close
+  end
+end

data/spec/info_active_record_pg_travis.rb

@@ -0,0 +1,34 @@
+class Baza::InfoActiveRecordPg
+  attr_reader :db
+
+  def self.connection
+    require "active_record"
+    require "pg"
+
+    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+      adapter: "postgresql",
+      database: "baza",
+      username: "postgres"
+    )
+    @conn ||= @conn_pool.connection
+
+    {pool: @conn_pool, conn: @conn}
+  end
+
+  def initialize(args = {})
+    data = Baza::InfoActiveRecordPg.connection
+
+    @db = Baza::Db.new({
+      type: :active_record,
+      conn: data.fetch(:conn)
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list(&:drop)
+  end
+
+  def after
+    @db.close
+  end
+end

data/spec/info_active_record_sqlite3.rb

@@ -21,7 +21,7 @@ class Baza::InfoActiveRecordSqlite3
 
     @db = Baza::Db.new({
       type: :active_record,
-      conn: data[:conn],
+      conn: data.fetch(:conn),
       index_append_table_name: true
     }.merge(args))
   end

data/spec/info_mysql2_example.rb

@@ -12,9 +12,7 @@ class Baza::InfoMysql
   end
 
   def before
-    @db.tables.list do |table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/{info_mysql2_shippable.rb → info_mysql2_travis.rb}

@@ -5,15 +5,13 @@ class Baza::InfoMysql2
     @db = Baza::Db.new({
       type: :mysql2,
       host: "localhost",
-      user: "shippa",
+      user: "travis",
       db: "baza"
     }.merge(args))
   end
 
   def before
-    @db.tables.list do |table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_mysql_example.rb

@@ -12,9 +12,7 @@ class Baza::InfoMysql
   end
 
   def before
-    @db.tables.list do |table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/{info_mysql_shippable.rb → info_mysql_travis.rb}

@@ -5,15 +5,13 @@ class Baza::InfoMysql
     @db = Baza::Db.new({
       type: :mysql,
       host: "localhost",
-      user: "shippa",
+      user: "travis",
       db: "baza"
     }.merge(args))
   end
 
   def before
-    @db.tables.list do |table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/info_pg_example.rb

@@ -0,0 +1,22 @@
+class Baza::InfoPg
+  attr_reader :db
+
+  def initialize(args = {})
+    @db = Baza::Db.new({
+      type: :pg,
+      host: "127.0.0.1",
+      user: "baza-test",
+      pass: "password",
+      db: "baza-test",
+      debug: false
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list(&:drop)
+  end
+
+  def after
+    @db.close
+  end
+end

data/spec/info_pg_travis.rb

@@ -0,0 +1,20 @@
+class Baza::InfoPg
+  attr_reader :db
+
+  def initialize(args = {})
+    @db = Baza::Db.new({
+      type: :pg,
+      user: "postgres",
+      db: "baza",
+      debug: false
+    }.merge(args))
+  end
+
+  def before
+    @db.tables.list(&:drop)
+  end
+
+  def after
+    @db.close
+  end
+end

data/spec/info_sqlite3.rb

@@ -18,9 +18,7 @@ class Baza::InfoSqlite3
   end
 
   def before
-    @db.tables.list do |table|
-      table.drop
-    end
+    @db.tables.list(&:drop)
   end
 
   def after

data/spec/spec_helper.rb

@@ -15,6 +15,6 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = [:expect]
   end
 end

data/spec/support/driver_active_record_collection.rb

@@ -0,0 +1,62 @@
+require "active_record"
+require_relative "../active_record/models/user"
+
+shared_examples_for "an active record driver" do
+  let(:driver) { constant.new(type_translation: true) }
+  let(:db) { driver.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: "number", type: :int, default: 0},
+        {name: "float", type: :float, default: 0.0}
+      ]
+    )
+    db.tables[:test]
+  end
+
+  before do
+    driver.before
+
+    db.tables.create(
+      "users",
+      columns: [
+        {name: "id", type: :int, autoincr: true, primarykey: true},
+        {name: "email", type: :varchar}
+      ],
+      indexes: [
+        {name: "index_on_email", columns: ["email"], unique: true}
+      ]
+    )
+  end
+
+  after do
+    driver.after
+  end
+
+  it "saves models through baza" do
+    user = User.new(email: "test@example.com")
+    expect(user.valid?).to eq true
+    db.driver.save_model!(user, update_on_duplicate_key: true)
+    expect(user.persisted?).to eq true
+    expect(user.id).to eq 1
+    expect(user.email).to eq "test@example.com"
+  end
+
+  it "upserts" do
+    user1 = User.new(email: "test@example.com")
+    db.driver.save_model!(user1)
+
+    user2 = User.new(email: "test@example.com")
+    db.driver.save_model!(user2, update_on_duplicate_key: true)
+
+    expect(user2.id).to eq user1.id
+  end
+end