simple-sql 0.5.19 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f07bda4a766c4847fdb1b6ff5b2ffbb46aadf64e57ae72ae0e033027aba2d13
-  data.tar.gz: 8637da9a4e8de6f7a57c8003db0fb27e0d479005730e88e14476f3c5e7edc6ca
+  metadata.gz: 35d1b619f4df0cf9527247e4148c10c035bc6ce3fc3d8302d9d59f68aba13efe
+  data.tar.gz: 945a6e98dc8057b9bbf222a149f6cda25105144d0e9815965c05e6b35423627a
 SHA512:
-  metadata.gz: 35b8dec9461128d4c1250c6ab3451431aa6defc442afb03cbbeb2fdb5247b9b4258aebcfb86014cf4d6bcad8313320ae028d6d65519a66cddd3dbb35524feb9c
-  data.tar.gz: b087a97ff95ec6f848bde598625ceaf4fd3864cfb3e37a17d7001edab4eabaffcaf5b124e7b401108fbd5622f25bc02eb019bb428d071f7d4bcbb37345cc1cb4
+  metadata.gz: 4a132b274a9ab9c10bebba9948d9611d9eba759ba3e492e40b94da391e136970039e3e88b495073e8da358d029c492a75b42128a8921894acd523362719b6d2d
+  data.tar.gz: 938f7f09cd06b1f743434edd3f257b30142fc82b067badef3e7e79aea92da430e0074cb41df9364eb49c13c3d8e32fcbd87932ee4e621c0159bd969a1a74c772

data/lib/pg/deprecated_constants.rb

@@ -1,6 +1,6 @@
 # pg 0.21 requires a file "pg/deprecated_constants" to warn about constant
 # deprecations of PGconn, PGresult, and PGError. Since this is the latest
-# version supported by Rails 4.2 Since this is also the latest version 
+# version supported by Rails 4.2 Since this is also the latest version
 # supported by ActiveRecord 4.2.* this means that with such a old version
 # you would be stuck with this rather senseless warning.
 

data/lib/simple/sql.rb

@@ -11,6 +11,7 @@ require_relative "sql/result"
 require_relative "sql/config"
 require_relative "sql/logging"
 require_relative "sql/connection"
+require_relative "sql/table_print"
 
 module Simple
   # The Simple::SQL module
@@ -34,6 +35,11 @@ module Simple
       "'#{PG::Connection.escape_string(s)}'"
     end
 
+    def table_print(records, io: STDOUT, width: :auto)
+      ::Simple::SQL::TablePrint.table_print(records, width: width, io: io)
+      records
+    end
+
     # connects to the database specified via the url parameter. If called
     # without argument it tries to determine a DATABASE_URL from either the
     # environment setting (DATABASE_URL) or from a config/database.yml file,

data/lib/simple/sql/connection.rb

@@ -63,5 +63,3 @@ class Simple::SQL::Connection
   extend Forwardable
   delegate [:wait_for_notify] => :raw_connection
 end
-
-# TODO disconnect! reconnect!

data/lib/simple/sql/connection/base.rb

@@ -68,7 +68,7 @@ class Simple::SQL::Connection
       records = all sql, *args, into: Hash
     end
 
-    ::Simple::SQL::Helpers::Printer.print(records, width: width, io: io)
+    ::Simple::SQL.table_print(records, width: width, io: io)
     records
   end
 

data/lib/simple/sql/helpers.rb

@@ -1,7 +1,6 @@
 module ::Simple::SQL::Helpers
 end
 
-require_relative "helpers/printer.rb"
 require_relative "helpers/decoder.rb"
 require_relative "helpers/encoder.rb"
 require_relative "helpers/row_converter.rb"

data/lib/simple/sql/{helpers/printer.rb → table_print.rb}

@@ -1,12 +1,12 @@
 # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity
 
 # private
-module Simple::SQL::Helpers::Printer
+module Simple::SQL::TablePrint
   extend self
 
   ROW_SEPARATOR = " | "
 
-  def print(records, io: STDOUT, width: :auto)
+  def table_print(records, io: STDOUT, width: :auto)
     # check args
 
     return if records.empty?
@@ -23,6 +23,7 @@ module Simple::SQL::Helpers::Printer
 
     rows = materialize_rows(records)
     column_widths = column_max_lengths(rows)
+
     if width
       column_widths = distribute_column_widths(column_widths, width, column_count, rows.first)
     end
@@ -68,6 +69,9 @@ module Simple::SQL::Helpers::Printer
 
     return column_widths if available_chars <= 0
 
+    required_chars = column_widths.sum
+    return column_widths if required_chars < total_chars
+
     # [TODO] The algorithm below produces ok-ish results - but usually misses a few characters
     # that could still be assigned a column. To do this we shuld emply D'Hondt or something
     # similar.

data/lib/simple/sql/version.rb

@@ -1,5 +1,5 @@
 module Simple
   module SQL
-    VERSION = "0.5.19"
+    VERSION = "0.5.20"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple-sql
 version: !ruby/object:Gem::Version
-  version: 0.5.19
+  version: 0.5.20
 platform: ruby
 authors:
 - radiospiel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-09 00:00:00.000000000 Z
+date: 2019-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg_array_parser
@@ -210,13 +210,13 @@ files:
 - lib/simple/sql/helpers/decoder.rb
 - lib/simple/sql/helpers/encoder.rb
 - lib/simple/sql/helpers/immutable.rb
-- lib/simple/sql/helpers/printer.rb
 - lib/simple/sql/helpers/row_converter.rb
 - lib/simple/sql/logging.rb
 - lib/simple/sql/result.rb
 - lib/simple/sql/result/association_loader.rb
 - lib/simple/sql/result/records.rb
 - lib/simple/sql/scope/count.rb
+- lib/simple/sql/table_print.rb
 - lib/simple/sql/version.rb
 - log/.gitkeep
 - scripts/stats
@@ -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.2
 signing_key: 
 specification_version: 4
 summary: SQL with a simple interface