baza 0.0.36 → 0.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fae6535d9e34fae8460213071209a7657c8dbe97
-  data.tar.gz: a3289f1628a01ca32000f3d9e96beef9033b00f8
+SHA256:
+  metadata.gz: d202a1ba85d839b238bbeece2e3fc217257f14ac2eb75f95c60385051fa20b62
+  data.tar.gz: 6781add95eb27f16cb5597ab550da7ee3ad0bf174de1ac146afc18278645c75e
 SHA512:
-  metadata.gz: 5a71d39ad1ba7a1b682a0b88800567ced7e94cfe3e489049f00e09b0dd8383645eca9ab04e45f68e8c3abf14e35b596efe5a58d8da647054c65b25b26bbee6f1
-  data.tar.gz: 1e5ec98de5eef606d1f483d67109a8563ca8bb65e9d52cff3c25e2cecd8eca809611552790ad9826b2499eca8ccbbebd831ed6000485b4349b260fb6ba43f9a2
+  metadata.gz: 2b3d6816458dd8b48668bd8706af772ba7cfefb3051c56cedd8fb829ca9c0259eb6f0b25f428022ad29c9dee15edb14599ac3938caedd8eaad6507a8f1940b46
+  data.tar.gz: 1842d03a4097a659c8d8ed3a42f7283102553be3d4e25eae38216f05c0750ec8efd6d09d53c3a6beed8fbd92f931d1199eeb866bcb63c83aca95ea3432a1433e

data/.ruby-version

@@ -1 +1 @@
-2.3.6
+2.5.7

data/Gemfile

@@ -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,21 +1,20 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    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 (5.2.0)
+    activemodel (6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord (6.0.2.1)
+      activemodel (= 6.0.2.1)
+      activesupport (= 6.0.2.1)
+    activerecord-jdbc-adapter (60.1-java)
+      activerecord (~> 6.0.0)
+    activesupport (6.0.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
     addressable (2.4.0)
-    arel (9.0.0)
     array_enumerator (0.0.10)
     ast (2.4.0)
     auto_autoloader (0.0.5)
@@ -24,8 +23,7 @@ GEM
       auto_autoloader
     builder (3.2.3)
     coderay (1.1.2)
-    concurrent-ruby (1.0.5)
-    concurrent-ruby (1.0.5-java)
+    concurrent-ruby (1.1.5)
     datet (0.0.25)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
@@ -33,8 +31,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)
+    ffi (1.11.1-java)
     git (1.3.0)
     github_api (0.16.0)
       addressable (~> 2.4.0)
@@ -45,11 +42,11 @@ GEM
       oauth2 (~> 1.0)
     hashie (3.5.7)
     highline (1.7.10)
-    i18n (1.0.1)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     jar-dependencies (0.3.12)
-    jdbc-mysql (5.1.44)
-    jdbc-sqlite3 (3.20.1)
+    jdbc-mysql (5.1.47)
+    jdbc-sqlite3 (3.28.0)
     jeweler (2.3.9)
       builder
       bundler
@@ -62,17 +59,17 @@ GEM
       rdoc
       semver2
     jwt (1.5.6)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (2.99.3)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    mini_portile2 (2.4.0)
+    minitest (5.13.0)
     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.10.5)
+      mini_portile2 (~> 2.4.0)
+    nokogiri (1.10.5-java)
     oauth2 (1.4.0)
       faraday (>= 0.8, < 0.13)
       jwt (~> 1.0)
@@ -83,21 +80,21 @@ GEM
       ast (~> 2.4.0)
     pg (0.21.0)
     powerpack (0.1.1)
-    pry (0.11.3)
+    pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    pry (0.11.3-java)
+    pry (0.12.2-java)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
       spoon (~> 0.0)
     psych (3.0.2)
     psych (3.0.2-java)
       jar-dependencies (>= 0.1.7)
-    rack (2.0.4)
+    rack (2.0.8)
     rainbow (2.2.2)
       rake
     rake (12.3.1)
-    rdoc (6.0.3)
+    rdoc (6.2.1)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
@@ -122,14 +119,15 @@ 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)
+    tzinfo (1.2.6)
       thread_safe (~> 0.1)
     unicode-display_width (1.3.0)
     wref (0.0.8)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   java
@@ -154,9 +152,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.2
+   1.17.3

data/VERSION

@@ -1 +1 @@
-0.0.36
+0.0.37

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.36 ruby lib
+# stub: baza 0.0.37 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "baza".freeze
-  s.version = "0.0.36"
+  s.version = "0.0.37"
 
   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-27"
+  s.date = "2020-01-07"
   s.description = "A database abstraction layer, model framework and database framework.".freeze
   s.email = "kj@gfish.com".freeze
   s.extra_rdoc_files = [
@@ -175,6 +175,7 @@ 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",
@@ -206,7 +207,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/baza".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.14".freeze
+  s.rubygems_version = "3.0.6".freeze
   s.summary = "A database abstraction layer, model framework and database framework.".freeze
 
   if s.respond_to? :specification_version then
@@ -233,7 +234,7 @@ Gem::Specification.new do |s|
       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"])
+      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"])
@@ -255,7 +256,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
   else
     s.add_dependency(%q<array_enumerator>.freeze, ["~> 0.0.10"])
@@ -278,7 +279,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/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/pg.rb

@@ -70,7 +70,7 @@ class Baza::Driver::Pg < Baza::BaseSqlDriver
 
     args = {dbname: db.opts.fetch(:db)}
     args[:port] = db.opts.fetch(:port) if db.opts[:port]
-    args[:hostaddr] = db.opts.fetch(:host) if db.opts[:host]
+    args[:host] = db.opts.fetch(:host) if db.opts[:host]
     args[:user] = db.opts.fetch(:user) if db.opts[:user]
     args[:password] = db.opts.fetch(:pass) if db.opts[:pass]
 

data/lib/baza/driver/pg/table.rb

@@ -1,9 +1,9 @@
 class Baza::Driver::Pg::Table < Baza::Table
   attr_reader :name
 
-  def initialize(args)
-    @db = args.fetch(:driver).db
-    @data = args.fetch(:data)
+  def initialize(driver:, data:)
+    @db = driver.db
+    @data = data
     @name = @data.fetch(:table_name)
   end
 
@@ -36,7 +36,7 @@ class Baza::Driver::Pg::Table < Baza::Table
   end
 
   def native?
-    false
+    name == "pg_stat_statements"
   end
 
   def columns(args = {})

data/lib/baza/driver/tiny.rb

@@ -1,8 +1,8 @@
 class Baza::Driver::Tiny < Baza::BaseSqlDriver
-  SEPARATOR_DATABASE = "[".freeze
-  SEPARATOR_TABLE = "[".freeze
-  SEPARATOR_COLUMN = "[".freeze
-  SEPARATOR_INDEX = "[".freeze
+  SEPARATOR_DATABASE = "]".freeze
+  SEPARATOR_TABLE = "]".freeze
+  SEPARATOR_COLUMN = "]".freeze
+  SEPARATOR_INDEX = "]".freeze
   SEPARATOR_VALUE = "'".freeze
 
   def initialize(db)
@@ -75,8 +75,7 @@ class Baza::Driver::Tiny < Baza::BaseSqlDriver
   end
 
   def query(sql)
-    result = @client.execute(sql)
-    Baza::Driver::Tiny::Result.new(result)
+    Baza::Driver::Tiny::Result.new(@client.execute(sql))
   end
 
   def self.quote_identifier(name)

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

@@ -1,6 +1,7 @@
 class Baza::Driver::Tiny::Result < Baza::ResultBase
   def initialize(result)
     @result = result.to_a
+    result.cancel
   end
 
   def each(&blk)

data/lib/baza/query_buffer.rb

@@ -103,7 +103,7 @@ private
       begin
         flush_real(@db_flush_async)
       rescue => e
-        $stderr.puts e.inspect
+        $stderr.puts "Baza QueryBuffer: #{e.inspect}"
         $stderr.puts e.backtrace
       end
     end

data/spec/drivers/pg/table_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Baza::Driver::Pg::Table do
+  let(:constant) do
+    const_name = "InfoPg"
+    require 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
+  let(:driver) { constant.new }
+  let(:db) { driver.db }
+
+  describe "#native?" do
+    it "returns true if the table is 'pg_stat_statements'-table" do
+      test_table = Baza::Driver::Pg::Table.new(driver: driver, data: {table_name: "pg_stat_statements"})
+
+      expect(test_table.native?).to eq true
+    end
+  end
+end

data/spec/info_sqlite3.rb

@@ -6,7 +6,7 @@ class Baza::InfoSqlite3
 
     @db = Baza::Db.new({
       type: :sqlite3,
-      path: ":memory:",
+      path: "#{Dir.tmpdir}/#{SecureRandom.hex(8)}.sqlite3",
       index_append_table_name: true,
       sql_to_error: true,
       debug: false

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require "baza"
+require "pry"
 
 if RUBY_PLATFORM == "java"
   require "jdbc/mysql"

data/spec/support/driver_collection.rb

@@ -340,7 +340,7 @@ shared_examples_for "a baza driver" do
     row = db_with_type_translation.select(:test, text: "Kasper").fetch
 
     expect(row.fetch(:text).class).to eq String
-    expect(row.fetch(:number).class.name).to eq "Fixnum"
+    expect(row.fetch(:number).class.name).to eq "Integer"
     expect(row.fetch(:float).class).to eq Float
 
     if db.driver.conn.class.name == "ActiveRecord::ConnectionAdapters::SQLite3Adapter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baza
 version: !ruby/object:Gem::Version
-  version: 0.0.36
+  version: 0.0.37
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2020-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: array_enumerator
@@ -294,16 +294,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.5'
 description: A database abstraction layer, model framework and database framework.
 email: kj@gfish.com
 executables: []
@@ -468,6 +468,7 @@ files:
 - 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
@@ -515,8 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A database abstraction layer, model framework and database framework.