baza 0.0.35 → 0.0.36

data/lib/baza/sql_queries/sqlite_upsert_duplicate_key.rb

@@ -51,7 +51,7 @@ private
   end
 
   def insert_sql
-    sql = "INSERT OR IGNORE INTO #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table} ("
+    sql = "INSERT OR IGNORE INTO #{@db.quote_table(@table_name)} ("
 
     combined_data = @updates.merge(@terms)
 
@@ -59,7 +59,7 @@ private
     combined_data.each_key do |column_name|
       sql << ", " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(column_name)}#{@db.sep_col}"
+      sql << @db.quote_column(column_name)
     end
 
     sql << ") VALUES ("
@@ -68,7 +68,7 @@ private
     combined_data.each_value do |value|
       sql << ", " unless first
       first = false if first
-      sql << @db.sqlval(value).to_s
+      sql << @db.quote_value(value).to_s
     end
 
     sql << ")"
@@ -76,13 +76,13 @@ private
   end
 
   def update_sql
-    sql = "UPDATE OR IGNORE #{@db.sep_table}#{@db.escape_table(@table_name)}#{@db.sep_table} SET "
+    sql = "UPDATE OR IGNORE #{@db.quote_table(@table_name)} SET "
 
     first = true
     @updates.each do |key, value|
       sql << ", " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << "#{@db.quote_column(key)} = #{@db.quote_value(value)}"
     end
 
     sql << " WHERE "
@@ -91,7 +91,7 @@ private
     @terms.each do |key, value|
       sql << " AND " unless first
       first = false if first
-      sql << "#{@db.sep_col}#{@db.escape_column(key)}#{@db.sep_col} = #{@db.sqlval(value)}"
+      sql << "#{@db.quote_column(key)} = #{@db.quote_value(value)}"
     end
 
     sql

data/lib/baza/table.rb

@@ -43,12 +43,12 @@ class Baza::Table
   end
 
   def rows_count
-    sql = "SELECT COUNT(*) AS count FROM #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table}"
+    sql = "SELECT COUNT(*) AS count FROM #{db.quote_table(name)}"
     @db.query(sql).fetch.fetch(:count).to_i
   end
 
   def truncate
-    @db.query("TRUNCATE #{@db.sep_table}#{@db.escape_table(name)}#{@db.sep_table}")
+    @db.query("TRUNCATE #{@db.quote_table(name)}")
     self
   end
 
@@ -60,7 +60,7 @@ class Baza::Table
 
   def create_columns(col_arr)
     col_arr.each do |col_data|
-      sql = "ALTER TABLE #{db.sep_col}#{name}#{db.sep_col} ADD COLUMN #{@db.columns.data_sql(col_data)};"
+      sql = "ALTER TABLE #{db.quote_column(name)} ADD COLUMN #{@db.columns.data_sql(col_data)};"
       @db.query(sql)
     end
   end

data/spec/baza/cloner_spec.rb

@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Baza::Cloner do
   it "can clone drivers" do
-    require "info_active_record_mysql2"
-    conn = Baza::InfoActiveRecordMysql2.connection
+    require "info_active_record_pg"
+    conn = Baza::InfoActiveRecordPg.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

data/spec/drivers/tiny_spec.rb

@@ -0,0 +1,27 @@
+require "spec_helper"
+
+describe Baza::Driver::Tiny do
+  describe "#quote_database" do
+    it "quotes the given database name" do
+      expect(Baza::Driver::Tiny.quote_database("test_database")).to eq "[test_database]"
+    end
+  end
+
+  describe "#quote_column" do
+    it "quotes the given column name" do
+      expect(Baza::Driver::Tiny.quote_column("test_column")).to eq "[test_column]"
+    end
+  end
+
+  describe "#quote_index" do
+    it "quotes the given index name" do
+      expect(Baza::Driver::Tiny.quote_index("test_index")).to eq "[test_index]"
+    end
+  end
+
+  describe "#quote_table" do
+    it "quotes the given table name" do
+      expect(Baza::Driver::Tiny.quote_table("test_table")).to eq "[test_table]"
+    end
+  end
+end

data/spec/info_active_record_pg_peak_flow.rb

@@ -5,12 +5,12 @@ class Baza::InfoActiveRecordPg
     require "active_record"
     require "pg"
 
-    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+    @conn_pool = ::ActiveRecord::Base.establish_connection(
       adapter: "postgresql",
       database: "baza",
       username: "postgres"
     )
-    @conn ||= @conn_pool.connection
+    @conn = @conn_pool.connection
 
     {pool: @conn_pool, conn: @conn}
   end

data/spec/info_active_record_sqlite3.rb

@@ -4,16 +4,13 @@ class Baza::InfoActiveRecordSqlite3
   def self.connection
     require "active_record"
 
-    path = "#{Dir.tmpdir}/baza_sqlite3_test_#{Time.now.to_f.to_s.hash}_#{Random.rand}.sqlite3"
-    File.unlink(path) if File.exist?(path)
-
-    @conn_pool ||= ::ActiveRecord::Base.establish_connection(
+    conn_pool = ::ActiveRecord::ConnectionAdapters::ConnectionHandler.new.establish_connection(
       adapter: "sqlite3",
-      database: path
+      database: ":memory:"
     )
-    @conn ||= @conn_pool.connection
+    conn = conn_pool.connection
 
-    {pool: @conn_pool, conn: @conn}
+    {pool: conn_pool, conn: conn}
   end
 
   def initialize(args = {})
@@ -26,11 +23,7 @@ class Baza::InfoActiveRecordSqlite3
     }.merge(args))
   end
 
-  def before
-    @db.tables.list(&:drop)
-  end
+  def before; end
 
-  def after
-    @db.close
-  end
+  def after; end
 end

data/spec/info_sqlite3.rb

@@ -3,26 +3,17 @@ class Baza::InfoSqlite3
 
   def initialize(args = {})
     require "sqlite3" unless RUBY_ENGINE == "jruby"
-    require "tmpdir"
-
-    @path = "#{Dir.tmpdir}/baza_sqlite3_test_#{Time.now.to_f.to_s.hash}_#{Random.rand}.sqlite3"
-    File.unlink(path) if File.exist?(@path)
 
     @db = Baza::Db.new({
       type: :sqlite3,
-      path: @path,
+      path: ":memory:",
       index_append_table_name: true,
       sql_to_error: true,
       debug: false
     }.merge(args))
   end
 
-  def before
-    @db.tables.list(&:drop)
-  end
+  def before; end
 
-  def after
-    @db.close
-    File.unlink(@path)
-  end
+  def after; end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.35
+  version: 0.0.36
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -112,16 +112,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-jdbc-adapter
   requirement: !ruby/object:Gem::Requirement
@@ -470,6 +470,7 @@ files:
 - spec/drivers/pg/columns_spec.rb
 - spec/drivers/pg_spec.rb
 - spec/drivers/sqlite3_spec.rb
+- spec/drivers/tiny_spec.rb
 - spec/info_active_record_example.rb
 - spec/info_active_record_mysql2_example.rb
 - spec/info_active_record_mysql2_peak_flow.rb
@@ -515,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.