baza 0.0.35 → 0.0.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 804414d008ce0e9a5a646b6695bbc7f8ff8b600de5aa2ccdac510f84a5d1825e
-  data.tar.gz: 01451d46fa3526121580179cc9da56faea6d1136a7a6af50ef4c0e3338644a1f
+SHA1:
+  metadata.gz: fae6535d9e34fae8460213071209a7657c8dbe97
+  data.tar.gz: a3289f1628a01ca32000f3d9e96beef9033b00f8
 SHA512:
-  metadata.gz: 4e8624039a6c7f49c6d82152812c1431073d18dd89f7f53e4bbcc69b7554a732c74f1b42b2b637b069528dec8dae30f54e3eec50bd0b6d5d828c810f4f4fc9ee
-  data.tar.gz: 4bb221beb8543c0ded092a713b22e15d4fa31add722297f403ba0d355d0467d9e43cd613746651968c5ab820f6886c3736ebc916c31103eee8d9c5be300e59e0
+  metadata.gz: 5a71d39ad1ba7a1b682a0b88800567ced7e94cfe3e489049f00e09b0dd8383645eca9ab04e45f68e8c3abf14e35b596efe5a58d8da647054c65b25b26bbee6f1
+  data.tar.gz: 1e5ec98de5eef606d1f483d67109a8563ca8bb65e9d52cff3c25e2cecd8eca809611552790ad9826b2499eca8ccbbebd831ed6000485b4349b260fb6ba43f9a2

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"

data/Gemfile.lock

@@ -1,23 +1,21 @@
 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)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
     activerecord-jdbc-adapter (50.0)
       activerecord (>= 2.2)
-    activesupport (4.2.5)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
+    activesupport (5.2.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.4.0)
-    arel (6.0.4)
+    arel (9.0.0)
     array_enumerator (0.0.10)
     ast (2.4.0)
     auto_autoloader (0.0.5)
@@ -35,6 +33,7 @@ GEM
     event_handler (0.0.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
+    ffi (1.9.23)
     ffi (1.9.23-java)
     git (1.3.0)
     github_api (0.16.0)
@@ -46,7 +45,7 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.5.7)
     highline (1.7.10)
-    i18n (0.9.5)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     jar-dependencies (0.3.12)
     jdbc-mysql (5.1.44)
@@ -62,8 +61,6 @@ GEM
       rake
       rdoc
       semver2
-    json (1.8.6)
-    json (1.8.6-java)
     jwt (1.5.6)
     method_source (0.9.0)
     mime-types (2.99.3)
@@ -139,7 +136,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (= 4.2.5)
+  activerecord
   activerecord-jdbc-adapter
   array_enumerator (~> 0.0.10)
   auto_autoloader (~> 0.0.5)
@@ -162,4 +159,4 @@ DEPENDENCIES
   wref (~> 0.0.8)
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/VERSION

@@ -1 +1 @@
-0.0.35
+0.0.36

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.35 ruby lib
+# stub: baza 0.0.36 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.35"
+  s.version = "0.0.36"
 
   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 = "2018-06-27"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -177,6 +177,7 @@ Gem::Specification.new do |s|
     "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",
@@ -205,7 +206,7 @@ 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 = "2.6.14".freeze
   s.summary = "A database abstraction layer, model framework and database framework.".freeze
 
   if s.respond_to? :specification_version then
@@ -219,7 +220,7 @@ Gem::Specification.new do |s|
       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>.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"])
@@ -241,7 +242,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"])
@@ -264,7 +265,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"])

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.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

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

@@ -14,7 +14,7 @@ class Baza::Driver::Mysql::Columns
 
     data[:maxlength] = 255 if type == :varchar && data[:maxlength].to_s.strip.empty?
 
-    sql = "#{@db.sep_col}#{@db.escape_column(data.fetch(:name))}#{@db.sep_col} #{type}"
+    sql = "#{@db.quote_column(data.fetch(:name))} #{type}"
     sql << "(#{data[:maxlength]})" if data[:maxlength]
     sql << " PRIMARY KEY" if data[:primarykey]
     sql << " AUTO_INCREMENT" if data[:autoincr]
@@ -23,11 +23,11 @@ class Baza::Driver::Mysql::Columns
     if data.key?(:default_func)
       sql << " DEFAULT #{data[:default_func]}"
     elsif data.key?(:default) && !data[:default].nil?
-      sql << " DEFAULT #{@db.sqlval(data.fetch(:default))}"
+      sql << " DEFAULT #{@db.quote_value(data.fetch(:default))}"
     end
 
-    sql << " COMMENT '#{@db.escape(data.fetch(:comment))}'" if data.key?(:comment)
-    sql << " AFTER #{@db.sep_col}#{@db.escape_column(data.fetch(:after))}#{@db.sep_col}" if data[:after] && !data[:first]
+    sql << " COMMENT #{@db.quote_value(data.fetch(:comment))}" if data.key?(:comment)
+    sql << " AFTER #{@db.quote_column(data.fetch(:after))}" if data[:after] && !data[:first]
     sql << " FIRST" if data[:first]
     sql << " STORAGE #{data[:storage].to_s.upcase}" if data[:storage]