baza 0.0.34 → 0.0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf763d9725a54b1f83dc7fdd00181b8361b150c2ebb266b11ad914c9c3d7cbfa
-  data.tar.gz: 1818e5b131b457a5e8bb7a7e06a23a5261e5f4a2fe9812d3de6bdd10b51dccfa
+  metadata.gz: a023d1752c079d9018cb06a5bdeaac2e86ecfc0734983a81db8e0212eae3e781
+  data.tar.gz: 1435ebdda514818695aff2314609a8a05e0bc021cff3cd5650c3bb69fe9bbeb2
 SHA512:
-  metadata.gz: 3668e2de450161e3e616beeb6c2a40a85f870bd0234956e9c5ac949615f9b49e6e51a4c069675c3ec7a69b81e42603307eafb0b0a3d76da8159981dabdd77580
-  data.tar.gz: a3eee544394d088cf4171cfadab545521a91e42d1cb66ed6cf90fb86c95f25163056526311b6678d2b2088c01b2d4f371fb511da38e1a74ff9bcfdf2b6fbd695
+  metadata.gz: 100e78cf3b0f1c84e45049260190e2d3e134a4f47b62b50df2955a6aa0fb85adde9fcf4a36c797480359473a81b3845a97c99e26f07432f8901a6b045622d581
+  data.tar.gz: 330e48088ea16f46d78f685e0238882b2b7acf4497e18d80b020790fcc01b78fd62168cf53364f01f149d6befdcf5f6ee5796100aae8884a7c1ccec4e88410aa

data/.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: monthly
+    time: "11:00"
+    timezone: Europe/Copenhagen
+  open-pull-requests-limit: 99
+  ignore:
+  - dependency-name: activerecord
+    versions:
+    - 6.1.1

data/.ruby-version

@@ -1 +1 @@
-2.3.6
+2.7.4

data/Gemfile

@@ -14,7 +14,7 @@ gem "wref", "~> 0.0.8"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development, :test do
-  gem "activerecord", "4.2.5"
+  gem "activerecord"
   gem "activerecord-jdbc-adapter", platform: :jruby
   gem "best_practice_project", "0.0.9", require: false
   gem "bundler"
@@ -28,5 +28,5 @@ group :development, :test do
   gem "rdoc"
   gem "rspec", "3.4.0"
   gem "rubocop", "0.39.0", require: false
-  gem "sqlite3", platform: :ruby
+  gem "sqlite3", "< 1.5", platform: :ruby
 end

data/Gemfile.lock

@@ -1,23 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
-      builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
-    activerecord-jdbc-adapter (50.0)
-      activerecord (>= 2.2)
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
+    activemodel (6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord (6.1.4.1)
+      activemodel (= 6.1.4.1)
+      activesupport (= 6.1.4.1)
+    activerecord-jdbc-adapter (61.1-java)
+      activerecord (~> 6.1.0)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     addressable (2.4.0)
-    arel (6.0.4)
     array_enumerator (0.0.10)
     ast (2.4.0)
     auto_autoloader (0.0.5)
@@ -25,9 +22,8 @@ GEM
     best_practice_project (0.0.9)
       auto_autoloader
     builder (3.2.3)
-    coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
     datet (0.0.25)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -35,7 +31,7 @@ GEM
     event_handler (0.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.23-java)
+    ffi (1.15.0-java)
     git (1.3.0)
     github_api (0.16.0)
       addressable (~> 2.4.0)
@@ -46,11 +42,11 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.5.7)
     highline (1.7.10)
-    i18n (0.9.5)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jar-dependencies (0.3.12)
-    jdbc-mysql (5.1.44)
-    jdbc-sqlite3 (3.20.1)
+    jdbc-mysql (8.0.17)
+    jdbc-sqlite3 (3.28.0)
     jeweler (2.3.9)
       builder
       bundler
@@ -62,20 +58,20 @@ GEM
       rake
       rdoc
       semver2
-    json (1.8.6)
-    json (1.8.6-java)
     jwt (1.5.6)
-    method_source (0.9.0)
+    method_source (1.0.0)
     mime-types (2.99.3)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    mini_portile2 (2.6.1)
+    minitest (5.14.4)
     multi_json (1.13.1)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     mysql2 (0.4.10)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    nokogiri (1.8.2-java)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-java)
+      racc (~> 1.4)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
@@ -86,21 +82,23 @@ GEM
       ast (~> 2.4.0)
     pg (0.21.0)
     powerpack (0.1.1)
-    pry (0.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry (0.11.3-java)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    pry (0.14.1-java)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
       spoon (~> 0.0)
     psych (3.0.2)
     psych (3.0.2-java)
       jar-dependencies (>= 0.1.7)
-    rack (2.0.4)
+    racc (1.5.2)
+    racc (1.5.2-java)
+    rack (2.2.3)
     rainbow (2.2.2)
       rake
-    rake (12.3.1)
-    rdoc (6.0.3)
+    rake (13.0.1)
+    rdoc (6.3.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -125,21 +123,22 @@ GEM
     simple_delegate (0.0.2)
     spoon (0.0.6)
       ffi
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     string-cases (0.0.4)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
     unicode-display_width (1.3.0)
     wref (0.0.8)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   java
   ruby
 
 DEPENDENCIES
-  activerecord (= 4.2.5)
+  activerecord
   activerecord-jdbc-adapter
   array_enumerator (~> 0.0.10)
   auto_autoloader (~> 0.0.5)
@@ -157,9 +156,9 @@ DEPENDENCIES
   rspec (= 3.4.0)
   rubocop (= 0.39.0)
   simple_delegate (~> 0.0.2)
-  sqlite3
+  sqlite3 (< 1.5)
   string-cases (~> 0.0.4)
   wref (~> 0.0.8)
 
 BUNDLED WITH
-   1.16.1
+   2.2.28

data/VERSION

@@ -1 +1 @@
-0.0.34
+0.0.38

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.34 ruby lib
+# stub: baza 0.0.38 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.34"
+  s.version = "0.0.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Kasper Johansen".freeze]
-  s.date = "2018-06-07"
+  s.date = "2021-10-04"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".github/dependabot.yml",
     ".rspec",
     ".rubocop.yml",
     ".rubocop_todo.yml",
@@ -175,8 +176,10 @@ Gem::Specification.new do |s|
     "spec/drivers/mysql2_spec.rb",
     "spec/drivers/mysql_spec.rb",
     "spec/drivers/pg/columns_spec.rb",
+    "spec/drivers/pg/table_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",
@@ -205,57 +208,35 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.7".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "A database abstraction layer, model framework and database framework.".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
-      s.add_runtime_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.5"])
-      s.add_runtime_dependency(%q<datet>.freeze, ["~> 0.0.25"])
-      s.add_runtime_dependency(%q<event_handler>.freeze, ["~> 0.0.0"])
-      s.add_runtime_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
-      s.add_runtime_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
-      s.add_runtime_dependency(%q<wref>.freeze, ["~> 0.0.8"])
-      s.add_development_dependency(%q<activerecord>.freeze, ["= 4.2.5"])
-      s.add_development_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
-      s.add_development_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
-      s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jdbc-mysql>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
-      s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_development_dependency(%q<mysql2>.freeze, ["= 0.4.10"])
-      s.add_development_dependency(%q<pg>.freeze, ["= 0.21.0"])
-      s.add_development_dependency(%q<pry>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, ["= 3.4.0"])
-      s.add_development_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
-      s.add_development_dependency(%q<sqlite3>.freeze, [">= 0"])
-    else
-      s.add_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
-      s.add_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.5"])
-      s.add_dependency(%q<datet>.freeze, ["~> 0.0.25"])
-      s.add_dependency(%q<event_handler>.freeze, ["~> 0.0.0"])
-      s.add_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
-      s.add_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
-      s.add_dependency(%q<wref>.freeze, ["~> 0.0.8"])
-      s.add_dependency(%q<activerecord>.freeze, ["= 4.2.5"])
-      s.add_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
-      s.add_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
-      s.add_dependency(%q<bundler>.freeze, [">= 0"])
-      s.add_dependency(%q<jdbc-mysql>.freeze, [">= 0"])
-      s.add_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
-      s.add_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
-      s.add_dependency(%q<mysql2>.freeze, ["= 0.4.10"])
-      s.add_dependency(%q<pg>.freeze, ["= 0.21.0"])
-      s.add_dependency(%q<pry>.freeze, [">= 0"])
-      s.add_dependency(%q<rdoc>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, ["= 3.4.0"])
-      s.add_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
-      s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
+    s.add_runtime_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.5"])
+    s.add_runtime_dependency(%q<datet>.freeze, ["~> 0.0.25"])
+    s.add_runtime_dependency(%q<event_handler>.freeze, ["~> 0.0.0"])
+    s.add_runtime_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
+    s.add_runtime_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
+    s.add_runtime_dependency(%q<wref>.freeze, ["~> 0.0.8"])
+    s.add_development_dependency(%q<activerecord>.freeze, [">= 0"])
+    s.add_development_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
+    s.add_development_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
+    s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jdbc-mysql>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jdbc-sqlite3>.freeze, [">= 0"])
+    s.add_development_dependency(%q<jeweler>.freeze, ["= 2.3.9"])
+    s.add_development_dependency(%q<mysql2>.freeze, ["= 0.4.10"])
+    s.add_development_dependency(%q<pg>.freeze, ["= 0.21.0"])
+    s.add_development_dependency(%q<pry>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
+    s.add_development_dependency(%q<rspec>.freeze, ["= 3.4.0"])
+    s.add_development_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
+    s.add_development_dependency(%q<sqlite3>.freeze, ["< 1.5"])
   else
     s.add_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
     s.add_dependency(%q<auto_autoloader>.freeze, ["~> 0.0.5"])
@@ -264,7 +245,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simple_delegate>.freeze, ["~> 0.0.2"])
     s.add_dependency(%q<string-cases>.freeze, ["~> 0.0.4"])
     s.add_dependency(%q<wref>.freeze, ["~> 0.0.8"])
-    s.add_dependency(%q<activerecord>.freeze, ["= 4.2.5"])
+    s.add_dependency(%q<activerecord>.freeze, [">= 0"])
     s.add_dependency(%q<activerecord-jdbc-adapter>.freeze, [">= 0"])
     s.add_dependency(%q<best_practice_project>.freeze, ["= 0.0.9"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])
@@ -277,7 +258,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>.freeze, [">= 0"])
     s.add_dependency(%q<rspec>.freeze, ["= 3.4.0"])
     s.add_dependency(%q<rubocop>.freeze, ["= 0.39.0"])
-    s.add_dependency(%q<sqlite3>.freeze, [">= 0"])
+    s.add_dependency(%q<sqlite3>.freeze, ["< 1.5"])
   end
 end
 

data/lib/baza/base_sql_driver.rb

@@ -54,6 +54,14 @@ class Baza::BaseSqlDriver
     self.class.escape_column(string)
   end
 
+  def self.quote_column(column_name)
+    "#{SEPARATOR_COLUMN}#{escape_column(column_name)}#{SEPARATOR_COLUMN}"
+  end
+
+  def quote_column(column_name)
+    "#{sep_col}#{escape_column(column_name)}#{sep_col}"
+  end
+
   def self.escape_table(string)
     string = string.to_s
     raise "Invalid table-string: #{string}" if string.include?(SEPARATOR_TABLE)
@@ -64,6 +72,14 @@ class Baza::BaseSqlDriver
     self.class.escape_table(string)
   end
 
+  def self.quote_table(table_name)
+    "#{SEPARATOR_TABLE}#{escape_table(table_name)}#{SEPARATOR_TABLE}"
+  end
+
+  def quote_table(table_name)
+    "#{sep_table}#{escape_table(table_name)}#{sep_table}"
+  end
+
   def self.escape_database(string)
     string = string.to_s
     raise "Invalid database-string: #{string}" if string.include?(SEPARATOR_DATABASE)
@@ -74,6 +90,14 @@ class Baza::BaseSqlDriver
     self.class.escape_database(string)
   end
 
+  def self.quote_database(database_name)
+    "#{SEPARATOR_DATABASE}#{escape_database(database_name)}#{SEPARATOR_DATABASE}"
+  end
+
+  def quote_database(database_name)
+    "#{sep_database}#{escape_database(database_name)}#{sep_database}"
+  end
+
   def self.escape_index(string)
     string = string.to_s
     raise "Invalid index-string: #{string}" if string.include?(SEPARATOR_INDEX)
@@ -84,6 +108,14 @@ class Baza::BaseSqlDriver
     self.class.escape_index(string)
   end
 
+  def self.quote_index(index_name)
+    "#{SEPARATOR_INDEX}#{escape_index(index_name)}#{SEPARATOR_INDEX}"
+  end
+
+  def quote_index(index_name)
+    "#{sep_index}#{escape_index(index_name)}#{sep_index}"
+  end
+
   def transaction
     @db.q("BEGIN TRANSACTION")
 
@@ -146,7 +178,7 @@ class Baza::BaseSqlDriver
   end
 
   def count(tablename, arr_terms = nil)
-    sql = "SELECT COUNT(*) AS count FROM #{@sep_table}#{tablename}#{@sep_table}"
+    sql = "SELECT COUNT(*) AS count FROM #{quote_table(tablename)}"
 
     if !arr_terms.nil? && !arr_terms.empty?
       sql << " WHERE #{sql_make_where(arr_terms)}"
@@ -169,7 +201,7 @@ class Baza::BaseSqlDriver
   #===Examples
   # db.delete(:users, {lastname: "Doe"})
   def delete(tablename, arr_terms, args = nil)
-    sql = "DELETE FROM #{@sep_table}#{tablename}#{@sep_table}"
+    sql = "DELETE FROM #{quote_table(tablename)}"
 
     if !arr_terms.nil? && !arr_terms.empty?
       sql << " WHERE #{sql_make_where(arr_terms)}"
@@ -199,11 +231,11 @@ class Baza::BaseSqlDriver
       if value.is_a?(Array)
         raise "Array for column '#{key}' was empty." if value.empty?
         values = value.map { |v| "'#{escape(v)}'" }.join(",")
-        sql << "#{@sep_col}#{key}#{@sep_col} IN (#{values})"
+        sql << "#{quote_column(key)} IN (#{values})"
       elsif value.is_a?(Hash)
         raise "Dont know how to handle hash."
       else
-        sql << "#{@sep_col}#{key}#{@sep_col} = #{sqlval(value)}"
+        sql << "#{quote_column(key)} = #{quote_value(value)}"
       end
     end
 
@@ -213,7 +245,7 @@ class Baza::BaseSqlDriver
   # Returns the correct SQL-value for the given value.
   # If it is a number, then just the raw number as a string will be returned.
   # nil's will be NULL and strings will have quotes and will be escaped.
-  def self.sqlval(val)
+  def self.quote_value(val)
     if val.class.name == "Fixnum" || val.is_a?(Integer)
       val.to_s
     elsif val == nil
@@ -227,9 +259,7 @@ class Baza::BaseSqlDriver
     end
   end
 
-  def sqlval(val)
-    return @conn.sqlval(val) if @conn.respond_to?(:sqlval)
-
+  def quote_value(val)
     if val.class.name == "Fixnum" || val.is_a?(Integer)
       val.to_s
     elsif val == nil

data/lib/baza/cloner.rb

@@ -24,6 +24,16 @@ class Baza::Cloner
         conn: connection
       }
 
+      Baza::Db.new(db_args)
+    elsif connection.class.name.include?("PostgreSQLAdapter")
+      connection = connection.instance_variable_get(:@connection)
+      connection = connection.instance_variable_get(:@connection) if RUBY_PLATFORM == "java"
+
+      db_args = {
+        type: :pg,
+        conn: connection
+      }
+
       Baza::Db.new(db_args)
     else
       raise "Unsupported adapter: #{connection.class.name}"

data/lib/baza/commands/select.rb

@@ -18,7 +18,7 @@ class Baza::Commands::Select
     add_select_sql
     add_terms_sql
     add_order_sql
-    add_limit_sql
+    add_limit_sql unless @db.mssql?
 
     result = execute_query
 
@@ -36,21 +36,23 @@ private
     # Set up IDQuery-stuff if that is given in arguments.
     if @args && @args[:idquery]
       if @args.fetch(:idquery) == true
-        select_sql = "#{@db.sep_col}id#{@db.sep_col}"
+        select_sql = "#{@db.quote_column(:id)}"
         @col = :id
       else
-        select_sql = "#{@db.sep_col}#{@db.escape_column(@args.fetch(:idquery))}#{@db.sep_col}"
+        select_sql = "#{@db.quote_column(@args.fetch(:idquery))}"
         @col = @args.fetch(:idquery)
       end
     end
 
     select_sql ||= "*"
-    @sql << "SELECT #{select_sql} FROM"
+    @sql << "SELECT"
+    @sql << top_sql if @db.mssql?
+    @sql << " #{select_sql} FROM"
 
     if @table_name.is_a?(Array)
-      @sql << " #{@sep_table}#{@table_name.first}#{@sep_table}.#{@sep_table}#{@table_name.last}#{@sep_table}"
+      @sql << " #{@db.quote_table(@table_name.first)}.#{@db.quote_table(@table_name.last)}"
     else
-      @sql << " #{@sep_table}#{@table_name}#{@sep_table}"
+      @sql << " #{@db.quote_table(@table_name)}"
     end
   end
 
@@ -69,10 +71,10 @@ private
         @args.fetch(:orderby).each do |order_by|
           @sql << "," unless first
           first = false if first
-          @sql << " #{@db.sep_col}#{@db.escape_column(order_by)}#{@db.sep_col}"
+          @sql << " #{@db.quote_column(order_by)}"
         end
       else
-        @sql << " #{@db.sep_col}#{@db.escape_column(@args.fetch(:orderby))}#{@db.sep_col}"
+        @sql << " #{@db.quote_column(@args.fetch(:orderby))}"
       end
     end
   end
@@ -99,6 +101,11 @@ private
     end
   end
 
+  def top_sql
+    return unless @args[:limit]
+    " TOP #{@args[:limit].to_i}"
+  end
+
   def execute_query
     # Do IDQuery if given in arguments.
     if @args && @args[:idquery]

data/lib/baza/db.rb

@@ -16,7 +16,7 @@ class Baza::Db
 
   delegate :last_id, :upsert, :upsert_duplicate_key, to: :commands
   delegate :current_database, :current_database_name, :with_database, to: :databases
-  delegate :close, :count, :delete, :esc, :escape, :escape_column, :escape_table, :escape_database, :escape_index, :insert, :select, :single, :sqlval, :sql_make_where, to: :driver
+  delegate *%i[close count delete esc escape escape_column escape_table escape_database escape_index quote_database quote_column quote_table quote_value quote_database quote_index insert select single quote_value sql_make_where], to: :driver
 
   attr_reader :sep_database, :sep_col, :sep_table, :sep_val, :sep_index, :opts, :driver, :int_types
 
@@ -444,14 +444,18 @@ class Baza::Db
   end
 
   def sqlite?
-    @sqlite ||= @driver.class.name.downcase.include?("sqlite")
+    @driver.class.name.downcase.include?("sqlite")
   end
 
   def mysql?
-    @mysql ||= @driver.class.name.downcase.include?("mysql")
+    @driver.class.name.downcase.include?("mysql")
+  end
+
+  def mssql?
+    @driver.class.name.downcase.include?("tiny")
   end
 
   def postgres?
-    @postgres ||= @driver.class.name.downcase.include?("pg")
+    @driver.class.name.downcase.include?("pg")
   end
 end

data/lib/baza/driver/active_record/result.rb

@@ -14,7 +14,9 @@ class Baza::Driver::ActiveRecord::Result < Baza::ResultBase
     return unless @result
 
     @result.each do |result|
-      result = result.delete_if { |k, _v| k.class.name == "Fixnum" } # Seems like this happens depending on the version installed? - kaspernj
+      # Seems like this happens depending on the version installed? - kaspernj
+      result = result.delete_if { |k, _v| k.class.name == "Integer" || k.class.name == "Fixnum" }
+
       result = Hash[result.map { |k, v| [k, v.to_s] }] if @type_translation == :string
 
       yield result.symbolize_keys

data/lib/baza/driver/active_record.rb

@@ -80,10 +80,17 @@ class Baza::Driver::ActiveRecord < Baza::BaseSqlDriver
     if conn_name.include?("mysql")
       @db.opts[:db] ||= query("SELECT DATABASE()").fetch.fetch(:"DATABASE()")
     elsif @driver_type == :pg
+      @conn.reconnect! unless postgres_connection_active?
       @db.opts[:db] ||= query("SELECT current_database()").fetch.values.first
     end
   end
 
+  def postgres_connection_active?
+    @conn.active?
+  rescue PG::ConnectionBad
+    true
+  end
+
   def query(sql)
     @result_constant.new(self, @conn.execute(sql))
   end

data/lib/baza/driver/mysql/column.rb

@@ -23,7 +23,7 @@ class Baza::Driver::Mysql::Column < Baza::Column
     other_table = other_column.table
 
     sql = "
-      ALTER TABLE #{@db.escape_table(table_name)}
+      ALTER TABLE #{@db.quote_table(table_name)}
       ADD CONSTRAINT #{@db.escape_table(fk_name)}
       FOREIGN KEY (#{@db.escape_table(name)})
       REFERENCES #{@db.escape_table(other_table.name)} (#{@db.escape_column(other_column.name)})
@@ -39,7 +39,7 @@ class Baza::Driver::Mysql::Column < Baza::Column
   end
 
   def reload
-    data = @db.query("SHOW FULL COLUMNS FROM `#{@db.escape_table(table_name)}` WHERE `Field` = '#{@db.esc(name)}'").fetch
+    data = @db.query("SHOW FULL COLUMNS FROM #{@db.quote_table(table_name)} WHERE #{@db.quote_column("Field")} = #{@db.quote_value(name)}").fetch
     raise Baza::Errors::ColumnNotFound unless data
     @data = data
     @type = nil
@@ -105,15 +105,13 @@ class Baza::Driver::Mysql::Column < Baza::Column
 
   # Drops the column from the table.
   def drop
-    @db.query("ALTER TABLE `#{@db.escape_table(table_name)}` DROP COLUMN `#{@db.escape_column(name)}`")
+    @db.query("ALTER TABLE #{@db.quote_table(table_name)} DROP COLUMN #{@db.quote_column(name)}")
     table.__send__(:remove_column_from_list, self)
     nil
   end
 
   # Changes the column properties by the given hash.
   def change(data)
-    col_escaped = "#{@db.sep_col}#{@db.escape_column(name)}#{@db.sep_col}"
-    table_escape = "#{@db.sep_table}#{@db.escape_table(table_name)}#{@db.sep_table}"
     newdata = data.clone
 
     newdata[:name] = name unless newdata.key?(:name)
@@ -126,7 +124,7 @@ class Baza::Driver::Mysql::Column < Baza::Column
     drop_add = true if name.to_s != newdata[:name].to_s
 
     table.__send__(:remove_column_from_list, self) if drop_add
-    @db.query("ALTER TABLE #{table_escape} CHANGE #{col_escaped} #{@db.columns.data_sql(newdata)}")
+    @db.query("ALTER TABLE #{@db.quote_table(table_name)} CHANGE #{@db.quote_column(name)} #{@db.columns.data_sql(newdata)}")
     @name = newdata[:name].to_s
     reload
     table.__send__(:add_column_to_list, self) if drop_add