simple-sql 0.5.23 → 0.5.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbb0a371e312ccb7a120a00dce988ea11882f6261461b4e9f7c2b674bd00dff0
-  data.tar.gz: 759fe61ab061924a2b3a1668fc1e92bd4ee8d89fa9af74cd266ec680bc96c97d
+  metadata.gz: 064d2319d350d4a8c56aa6cdf697ccd06d7c01426000396041e1a8bd1c74a5be
+  data.tar.gz: a55aaa2a188f306723911f457383c4536510d010149beaefbf001c025bd46e19
 SHA512:
-  metadata.gz: 0dd8a0f966dc83766647f0a5957b5e46432f3ee1c58aefbc11990ad0cc0abf627ff9b9419e2ab26bd53062abdd12b5b082463ed4c6079e46c37e3c4ca34a505e
-  data.tar.gz: f672f6e5dc920c805f3cc8fc13b02675156bee83a2da070f70f938896428b8bfa5a59d9d6aa0b325a30e846db83ed641931be07ac06616ba86bf6a05ebe3f242
+  metadata.gz: 872cf1147c72f1ae4c3030e71077a78ef5f33a7fc19e0779387de15aac18c314263439174e8efb19b3c85cffd43f926fd5c4964f63ead8f566aebaf7df61d873
+  data.tar.gz: d20549394c237fa154c0f1cb372b0286806242295a761f3a996e3b9170b0c0b05f81c70bc13bc285296388358cb9d4723322fc90a539fad87e223973a5c145bf

data/Makefile

@@ -1,3 +1,17 @@
+tests: test4 test5 test6
+
+test4:
+	SIMPLE_SQL_ACTIVERECORD_SPECS="< 5" bundle
+	rspec
+
+test5:
+	SIMPLE_SQL_ACTIVERECORD_SPECS="< 6" bundle
+	rspec
+
+test6:
+	SIMPLE_SQL_ACTIVERECORD_SPECS="< 7" bundle
+	rspec
+
 stats:
 	@scripts/stats lib/simple/sql
 	@scripts/stats spec/simple/sql

data/Rakefile

@@ -22,3 +22,13 @@ task default: "test:prepare_db" do
   sh "rspec"
   sh "rubocop -D"
 end
+
+desc 'release a new development gem version'
+task :release do
+  sh 'scripts/release.rb'
+end
+
+desc 'release a new stable gem version'
+task 'release:stable' do
+  sh 'BRANCH=stable scripts/release.rb'
+end

data/VERSION

@@ -0,0 +1 @@
+0.5.24

data/lib/simple/sql/connection_manager.rb

@@ -45,8 +45,17 @@ module Simple::SQL
           automatic_reconnect: connection_pool.automatic_reconnect,
           checkout_timeout: connection_pool.checkout_timeout
         }
-        ::Simple::SQL.logger.info "#{url}: connected to connection pool w/#{connection_pool_stats.inspect}"
+        ::Simple::SQL.logger.info "#{URI.without_password url}: connected to connection pool w/#{connection_pool_stats.inspect}"
       end
     end
   end
 end
+
+module URI
+  def self.without_password(uri)
+    uri = URI.parse(uri) unless uri.is_a?(URI)
+    uri = uri.dup
+    uri.password = "*" * uri.password.length if uri.password
+    uri
+  end
+end

data/lib/simple/sql/helpers/decoder.rb

@@ -23,7 +23,7 @@ module Simple::SQL::Helpers::Decoder
     when :hstore                        then HStore.parse(s)
     when :json                          then ::JSON.parse(s)
     when :jsonb                         then ::JSON.parse(s)
-    when :boolean                       then s == "t"
+    when :boolean                       then s == "t" || s == true
     else
       # unknown value, we just return the string here.
       # STDERR.puts "unknown type: #{type.inspect}"

data/lib/simple/sql/result.rb

@@ -46,6 +46,7 @@ class ::Simple::SQL::Result < Array
   #
   # This is only available for paginated scopes
   def total_count
+    # TODO: Implement total_count for non-paginated scopes!
     @total_count ||= pagination_scope.count
   end
 
@@ -61,7 +62,7 @@ class ::Simple::SQL::Result < Array
   end
 
   def pagination_scope
-    raise "Only available only for paginated scopes" unless paginated?
+    raise "Available only on paginated scopes" unless paginated?
 
     @pagination_scope
   end

data/lib/simple/sql/version.rb

@@ -1,5 +1,23 @@
 module Simple
-  module SQL
-    VERSION = "0.5.23"
+  module GemHelper
+    extend self
+
+    def version(name)
+      spec = Gem.loaded_specs[name]
+      version = spec.version.to_s
+      version += "+unreleased" if unreleased?(spec)
+      version
+    end
+
+    private
+
+    def unreleased?(spec)
+      return false unless defined?(Bundler::Source::Gemspec)
+      return true if spec.source.is_a?(::Bundler::Source::Gemspec)
+      return true if spec.source.is_a?(::Bundler::Source::Path)
+      false
+    end
   end
+
+  VERSION = GemHelper.version "simple-sql"
 end

data/scripts/release

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+$0.rb "$@"

data/scripts/release.rb

@@ -0,0 +1,94 @@
+#!/usr/bin/env ruby
+
+# -- helpers ------------------------------------------------------------------
+
+def sys(cmd)
+  STDERR.puts "> #{cmd}"
+  system cmd
+  return true if $?.success?
+
+  STDERR.puts "> #{cmd} returned with exitstatus #{$?.exitstatus}"
+  $?.success?
+end
+
+def sys!(cmd, error: nil)
+  return true if sys(cmd)
+  STDERR.puts error if error
+  exit 1
+end
+
+def die!(msg)
+  STDERR.puts msg
+  exit 1
+end
+
+ROOT = File.expand_path("#{File.dirname(__FILE__)}/..")
+
+GEMSPEC = Dir.glob("*.gemspec").first || die!("Missing gemspec file.")
+
+# -- Version reading and bumping ----------------------------------------------
+
+module Version
+  extend self
+
+  VERSION_FILE = "#{Dir.getwd}/VERSION"
+
+  def read_version
+    version = File.exist?(VERSION_FILE) ? File.read(VERSION_FILE) : "0.0.1"
+    version.chomp!
+    raise "Invalid version number in #{VERSION_FILE}" unless version =~ /^\d+\.\d+\.\d+$/
+    version
+  end
+
+  def auto_version_bump
+    old_version_number = read_version
+    old = old_version_number.split('.')
+
+    current = old[0..-2] << old[-1].next
+    current.join('.')
+  end
+
+  def bump_version
+    next_version = ENV["VERSION"] || auto_version_bump
+    File.open(VERSION_FILE, "w") { |io| io.write next_version }
+  end
+end
+
+# -- check, bump, release a new gem version -----------------------------------
+
+Dir.chdir ROOT
+$BASE_BRANCH = ENV['BRANCH'] || 'master'
+
+# ENV["BUNDLE_GEMFILE"] = "#{Dir.getwd}/Gemfile"
+# sys! "bundle install"
+
+sys! "git diff --exit-code > /dev/null", error: 'There are unstaged changes in your working directory'
+sys! "git diff --cached --exit-code > /dev/null", error: 'There are staged but uncommitted changes'
+
+sys! "git checkout #{$BASE_BRANCH}"
+sys! "git pull"
+
+Version.bump_version
+version = Version.read_version
+
+sys! "git add VERSION"
+sys! "git commit -m \"bump gem to v#{version}\""
+sys! "git tag -a v#{version} -m \"Tag #{version}\""
+
+sys! "git push origin #{$BASE_BRANCH}"
+sys! 'git push --tags --force'
+
+sys! "gem build #{GEMSPEC}"
+sys! "mkdir -p pkg"
+sys! "mv *.gem pkg"
+
+gem_file = Dir.glob('pkg/*.gem').sort.last
+
+sys! "gem install #{gem_file}"
+sys! "gem push #{gem_file}"
+
+STDERR.puts <<-MSG
+================================================================================
+Thank you for releasing a new gem version. You made my day.
+================================================================================
+    MSG

data/simple-sql.gemspec

@@ -3,13 +3,9 @@
 # Copyright (c) 2016, 2017 @radiospiel, mediapeers Gem
 # Distributed under the terms of the modified BSD license, see LICENSE.BSD
 
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'simple/sql/version'
-
 Gem::Specification.new do |gem|
   gem.name     = "simple-sql"
-  gem.version  = Simple::SQL::VERSION
+  gem.version  = File.read "VERSION"
 
   gem.authors  = [ "radiospiel", "mediapeers GmbH" ]
   gem.email    = "eno@radiospiel.org"
@@ -27,13 +23,19 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '~> 2.3'
 
-  gem.add_dependency 'pg_array_parser', '~> 0'
+  gem.add_dependency 'pg_array_parser', '~> 0', '>= 0.0.9'
   gem.add_dependency 'pg', '~> 0.20'
   gem.add_dependency 'expectation', '~> 1'
 
   gem.add_dependency 'digest-crc', '~> 0'
 
-  gem.add_dependency 'activerecord', '> 4'
+  # during tests we check the SIMPLE_SQL_ACTIVERECORD_SPECS environment setting.
+  # Run make tests to run all tests
+  if ENV["SIMPLE_SQL_ACTIVERECORD_SPECS"]
+    gem.add_dependency 'activerecord', '> 4.2', *(ENV["SIMPLE_SQL_ACTIVERECORD_SPECS"].split(","))
+  else
+    gem.add_dependency 'activerecord', '> 4.2', '< 7'
+  end
 
   # optional gems (required by some of the parts)
 
@@ -43,6 +45,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec', '~> 3.7'
   gem.add_development_dependency 'rubocop', '~> 0.61.1'
   gem.add_development_dependency 'simplecov', '~> 0'
-
-  gem.add_development_dependency 'memory_profiler', '~> 0.9.12'
 end

data/spec/simple/sql/each_spec.rb

@@ -64,85 +64,4 @@ describe "Simple::SQL.each" do
       expect(received.map(&:class).uniq).to eq([Simple::SQL::Helpers::Immutable])
     end
   end
-  
-  xdescribe "memory usage: pending due to inconclusive results" do
-    it "generates a series" do
-      each! "SELECT a.n from generate_series(1, 100) as a(n)"
-      expect(received).to eq((1..100).to_a)
-    end
-
-    require 'memory_profiler'
-    
-    def measure_retained_objects(msg, &block)
-      r = nil
-      report = MemoryProfiler.report do
-        r = yield
-      end
-      
-      STDERR.puts "#{msg} Total allocated: #{report.total_allocated_memsize} bytes (#{report.total_allocated} objects)"
-      STDERR.puts "#{msg} Total retained:  #{report.total_retained_memsize} bytes (#{report.total_retained} objects)"
-
-      report.total_retained_memsize
-    end
-
-    it "is using less memory than .all" do
-      sql_warmup = "SELECT a.n from generate_series(10000, 100) as a(n)"
-
-        SQL.all(sql_warmup, into: Hash)
-
-        SQL.each(sql_warmup) do |id|
-          :nop
-        end
-
-      cnt = 1000000
-      sql = "SELECT a.n from generate_series(#{cnt}, #{cnt}) as a(n)"
-
-      r = nil
-      retained_objects_all = measure_retained_objects "all" do
-        r = SQL.all(sql, into: Hash)
-      end
-
-      retained_objects_each = measure_retained_objects "each"  do
-        r = SQL.each(sql) do |id|
-          :nop
-        end
-      end
-      
-      expect(0).to eq "one"
-    end
-  end
-end
-
-__END__
-
-  describe "each into: X" do
-    it "calls the database" do
-      r = SQL.all("SELECT id FROM users", into: Hash)
-      expect(r).to be_a(Array)
-      expect(r.length).to eq(USER_COUNT)
-      expect(r.map(&:class).uniq).to eq([Hash])
-    end
-
-    it "returns an empty array when there is no match" do
-      r = SQL.all("SELECT * FROM users WHERE FALSE", into: Hash)
-      expect(r).to eq([])
-    end
-
-    it "yields the results into a block" do
-      received = []
-      SQL.all("SELECT id FROM users", into: Hash) do |hsh|
-        received << hsh
-      end
-      expect(received.length).to eq(USER_COUNT)
-      expect(received.map(&:class).uniq).to eq([Hash])
-    end
-
-    it "does not yield if there is no match" do
-      received = []
-      SQL.all("SELECT id FROM users WHERE FALSE", into: Hash) do |hsh|
-        received << hsh
-      end
-      expect(received.length).to eq(0)
-    end
-  end
 end

data/spec/support/001_database.rb

@@ -4,8 +4,9 @@ require "yaml"
 abc = YAML.load_file("config/database.yml")
 ActiveRecord::Base.establish_connection(abc["test"])
 
-# Remove after migration to Rails 5
-ActiveRecord::Base.raise_in_transactional_callbacks = true
+if ActiveRecord::Base.respond_to?(:raise_in_transactional_callbacks=)
+  ActiveRecord::Base.raise_in_transactional_callbacks = true
+end
 
 ActiveRecord::Base.logger = Logger.new("log/test.log")
 

data/spec/support/004_simplecov.rb

@@ -5,6 +5,7 @@ SimpleCov.start do
   add_filter do |src|
     next true if src.filename =~ /\/spec\//
     next true if src.filename =~ /\/immutable\.rb/
+    next true if src.filename =~ /simple\/sql\/table_print\.rb/
 
     false
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.23
+  version: 0.5.24
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-09 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +79,20 @@ dependencies:
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -151,20 +163,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: memory_profiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.12
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.12
 description: SQL with a simple interface. Postgres only.
 email: eno@radiospiel.org
 executables: []
@@ -178,6 +176,7 @@ files:
 - Makefile
 - README.md
 - Rakefile
+- VERSION
 - bin/console
 - bin/db_restore
 - bin/pg
@@ -219,6 +218,8 @@ files:
 - lib/simple/sql/table_print.rb
 - lib/simple/sql/version.rb
 - log/.gitkeep
+- scripts/release
+- scripts/release.rb
 - scripts/stats
 - scripts/watch
 - simple-sql.gemspec
@@ -248,7 +249,6 @@ files:
 - spec/support/003_factories.rb
 - spec/support/004_simplecov.rb
 - spec/support/model/user.rb
-- tasks/release.rake
 - vendor/.gitignore
 - vendor/Makefile
 homepage: http://github.com/radiospiel/simple-sql
@@ -269,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: SQL with a simple interface

data/tasks/release.rake

@@ -1,107 +0,0 @@
-require 'bundler'
-Bundler.setup
-
-GEM_ROOT = File.expand_path('../../', __FILE__)
-GEM_SPEC = "simple-sql.gemspec"
-
-require 'simple/sql/version'
-VERSION_FILE_PATH = 'lib/simple/sql/version.rb'
-
-class VersionNumberTracker
-  class << self
-    def update_version_file(old_version_number, new_version_number)
-      old_line = "VERSION = \"#{old_version_number}\""
-      new_line = "VERSION = \"#{new_version_number}\""
-      update = File.read(VERSION_FILE_PATH).gsub(old_line, new_line)
-      File.open(VERSION_FILE_PATH, 'w') { |file| file.puts update }
-      new_version_number
-    end
-
-    def auto_version_bump
-      old_version_number = Simple::SQL::VERSION
-      old = old_version_number.split('.')
-      current = old[0..-2] << old[-1].next
-      new_version_number = current.join('.')
-
-      update_version_file(old_version_number, new_version_number)
-    end
-
-    def manual_version_bump
-      update_version_file(Simple::SQL::VERSION, ENV['VERSION'])
-    end
-
-    def update_version_number
-      @version = ENV['VERSION'] ? manual_version_bump : auto_version_bump
-    end
-
-    attr_reader :version
-  end
-end
-
-namespace :release do
-  task :version do
-    VersionNumberTracker.update_version_number
-  end
-
-  task :build do
-    Dir.chdir(GEM_ROOT) do
-      sh("gem build #{GEM_SPEC}")
-    end
-  end
-
-  desc "Commit changes"
-  task :commit do
-    Dir.chdir(GEM_ROOT) do
-      version = VersionNumberTracker.version
-      sh("git add #{VERSION_FILE_PATH}")
-      sh("git commit -m \"bump to v#{version}\"")
-      sh("git tag -a v#{version} -m \"Tag\"")
-    end
-  end
-
-  desc "Push code and tags"
-  task :push do
-    sh("git push origin #{$TARGET_BRANCH}")
-    sh('git push --tags')
-  end
-
-  desc "Cleanup"
-  task :clean do
-    Dir.glob(File.join(GEM_ROOT, '*.gem')).each { |f| FileUtils.rm_rf(f) }
-  end
-
-  desc "Push Gem to gemfury"
-  task :publish do
-    Dir.chdir(GEM_ROOT) { sh("gem push #{Dir.glob('*.gem').first}") }
-  end
-
-  task :target_master do
-    $TARGET_BRANCH = 'master'
-  end
-
-  task :target_stable do
-    $TARGET_BRANCH = 'stable'
-  end
-
-  task :checkout do
-    sh "git status --untracked-files=no --porcelain > /dev/null || (echo '*** working dir not clean' && false)"
-    sh "git checkout #{$TARGET_BRANCH}"
-    sh "git pull"
-  end
-
-  task default: [
-    'checkout',
-    'version',
-    'clean',
-    'build',
-    'commit',
-    'push',
-    'publish'
-  ]
-
-  task master: %w(target_master default)
-  task stable: %w(target_stable default)
-end
-
-desc "Clean, build, commit and push"
-task release: 'release:master'