dba 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d8a51736a883e5fa3608fd0429dbf3a819f2903a2da62d1df26d234952c899d
-  data.tar.gz: bcdb786558aab8e9235324eeb06e073bff126c73abd680213f030d8560cc5306
+  metadata.gz: ff91c96a26c84120b2294eaceafbc9cd97d50ae7b8138ed08657efe355fe905b
+  data.tar.gz: 1e25615aea3aab8f5820f790d038363ea2854488e950d3925e48953d1055006c
 SHA512:
-  metadata.gz: 5fefa4be5caa1d897e9a3e330b6535351f5f503cc4b351e37cf8a7ef8b30f93555491bf5c09836c8b43f13c503d3783bb7e9173a2a4c2ca696bc8b5b1c903379
-  data.tar.gz: c6aea9949fe0b38718bee070cc3772b57b1ecb060b89c6fd497baa27dc30a0b2ed0edbc9b51157d8373ca057fbd85cb0a858f7f7665b3ba94bb99bcee095cc83
+  metadata.gz: b77b8fe626319fe20ac77cb31bb5bd2ed349438ea76ef6472b7367e22a804d1027a99744bde3ad2e32e7104f88a52b125a49f32c40223095281f648f150c8f64
+  data.tar.gz: 21d2f2a661aacc27375c7e9031c1057471ca627f0fb1bcb2c47dc051096e9d15d507d186854bb2fbac2b9851ba63ef2c807d7f91814ecd9490c564c6e073bdf1

data/CHANGES.md

@@ -1,3 +1,10 @@
+# 2.2.0
+
+* Fixed compatibility with psych 4+
+
+* The sample command now excludes nil/null values
+
+
 # 2.1.0
 
 * Fixed arity check for commands with optional arguments

data/dba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dba'
-  s.version = '2.1.0'
+  s.version = '2.2.0'
   s.license = 'GPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']

data/lib/dba/database.rb

@@ -73,7 +73,13 @@ module DBA::Database
   end
 
   def database_config
-    YAML.load(ERB.new(File.read(database_config_path)).result)
+    source = ERB.new(File.read(database_config_path)).result
+
+    if YAML.respond_to?(:unsafe_load)
+      YAML.unsafe_load(source)
+    else
+      YAML.load(source)
+    end
   end
 
   def development_database_args

data/lib/dba/sample.rb

@@ -5,7 +5,7 @@ class DBA::Sample < DBA::Command
     column_name = column.to_sym if column
 
     if column_name
-      dataset = database[table_name].distinct.select(column_name)
+      dataset = database[table_name].exclude(column_name => nil).distinct.select(column_name)
       dataset.from_self.order(random_function).limit(20).each do |row|
         puts row[column_name]
       end

data/lib/dba.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2022 TIMCRAFT
+# Copyright (c) 2019-2024 TIMCRAFT
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dba
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: See description