dba 1.1.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4212cdf60ed43e28c00a0bb815eabf6ff0912535713a27a425f077e71ef27f4d
-  data.tar.gz: a3da3be24d5e75207eb239fd814307c02457d22b286f1de548b5429c830dec60
+  metadata.gz: 6d8a51736a883e5fa3608fd0429dbf3a819f2903a2da62d1df26d234952c899d
+  data.tar.gz: bcdb786558aab8e9235324eeb06e073bff126c73abd680213f030d8560cc5306
 SHA512:
-  metadata.gz: 84c04318233dc14cacafb8b5bd065fb1d44d713cbbf39f50463dd1c46e12bc49599560e637dc0179ccbcc44b8c2cc3bde45a9244daf5d28867a0d538762fe352
-  data.tar.gz: 0a62d78ddcd245fc5d8781f3af94dda6b463f5dac11623fe11be546339de7bdedd8827d08b68db6da85a1fb377bf2316f724bb83ac54331bf850be7f557c4d62
+  metadata.gz: 5fefa4be5caa1d897e9a3e330b6535351f5f503cc4b351e37cf8a7ef8b30f93555491bf5c09836c8b43f13c503d3783bb7e9173a2a4c2ca696bc8b5b1c903379
+  data.tar.gz: c6aea9949fe0b38718bee070cc3772b57b1ecb060b89c6fd497baa27dc30a0b2ed0edbc9b51157d8373ca057fbd85cb0a858f7f7665b3ba94bb99bcee095cc83

data/CHANGES.md

@@ -1,3 +1,27 @@
+# 2.1.0
+
+* Fixed arity check for commands with optional arguments
+
+* Added support for .jsonl extension to dump and load commands
+
+* Added support for .ndjson extension to dump and load commands
+
+
+# 2.0.0
+
+* **Required ruby version is now 2.5.0**
+
+* Fixed diff command
+
+* Added select command
+
+* The indexes command now shows which indexes are unique
+
+* The schema command now shows which columns have array types
+
+* The postgres database is now used by default; use `.env` or `config/database.yml` to specify a different database name
+
+
 # 1.1.0
 
 * Fixed sample command for postgres
@@ -6,6 +30,7 @@
 
 * Added load command for loading data from CSV, LDJSON, or YAML
 
+
 # 1.0.0
 
 * First version!

data/README.md

@@ -27,6 +27,7 @@ You can connect to any database supported by [sequel](https://rubygems.org/gems/
       dba pull TABLE URL
       dba sample TABLE [COLUMN]
       dba schema [TABLE]
+      dba select TABLE COLUMN VALUE
       dba tables 
 
 

data/dba.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'dba'
-  s.version = '1.1.0'
+  s.version = '2.1.0'
   s.license = 'GPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.description = 'Ruby command line tool for working with development databases'
   s.summary = 'See description'
   s.files = Dir.glob('lib/**/*.rb') + %w[CHANGES.md LICENSE.txt README.md dba.gemspec]
-  s.required_ruby_version = '>= 2.3.0'
+  s.required_ruby_version = '>= 2.5.0'
   s.add_dependency('zeitwerk', '~> 2', '>= 2.2')
   s.add_dependency('sequel', '~> 5')
   s.add_dependency('pastel', '~> 0')

data/lib/dba/command.rb

@@ -1,4 +1,16 @@
 class DBA::Command
+  def self.arity_check(args)
+    parameters = instance_method(:call).parameters
+
+    required, optional = parameters.partition { |(type, name)| type == :req }
+
+    expected = optional.empty? ? required.size : (required.size .. required.size + optional.size)
+
+    unless expected === args.size
+      raise DBA::Error, "incorrect number of arguments (given #{args.size}, expected #{expected})"
+    end
+  end
+
   def initialize(database)
     self.database = database
   end

data/lib/dba/database.rb

@@ -3,6 +3,7 @@
 require 'sequel'
 require 'yaml'
 require 'erb'
+require 'socket'
 
 module DBA::Database
   extend self
@@ -31,7 +32,7 @@ module DBA::Database
     end
 
     if postgres_running?
-      return "postgres://localhost:5432/#{postgres_database_name}"
+      return 'postgres://localhost:5432/postgres'
     end
 
     if path = Dir['*.sqlite3'].first
@@ -63,12 +64,16 @@ module DBA::Database
     File.exist?('.env')
   end
 
+  def database_config_path
+    File.join('config', 'database.yml')
+  end
+
   def database_config?
-    File.exist?('config/database.yml')
+    File.exist?(database_config_path)
   end
 
   def database_config
-    YAML.load(ERB.new(File.read('config/database.yml')).result)
+    YAML.load(ERB.new(File.read(database_config_path)).result)
   end
 
   def development_database_args
@@ -78,21 +83,8 @@ module DBA::Database
     args
   end
 
-  def postgres_database_name
-    heroku_app_name || working_directory_name
-  end
-
-  def heroku_app_name
-    if `git config --get remote.heroku.url`.chomp =~ %r{(?<=[:/])([^:/]+)\.git\z}
-      $1
-    end
-  end
-
-  def working_directory_name
-    File.basename(Dir.pwd)
-  end
-
   def postgres_running?
-    !`lsof -i:5432`.strip.empty?
+    Socket.tcp('localhost', 5432) { :connected }
+  rescue Errno::ECONNREFUSED
   end
 end

data/lib/dba/diff.rb

@@ -8,7 +8,7 @@ class DBA::Diff < DBA::Command
 
     other_tables = other_database.tables
 
-    diff tables, other_tables
+    printer.print_diff tables, other_tables
 
     tables &= other_tables # only diff columns/indexes for tables that exist in both databases
 
@@ -21,7 +21,7 @@ class DBA::Diff < DBA::Command
 
   def list_columns(database, tables)
     tables.inject([]) do |columns, table_name|
-      columns + database.schema(table_name).map { |name, info| format_column(name, info) }
+      columns + database.schema(table_name).map { |name, info| format_column(name, info, table_name) }
     end
   end
 
@@ -31,7 +31,7 @@ class DBA::Diff < DBA::Command
     end
   end
 
-  def format_column(name, info_hash)
+  def format_column(name, info_hash, table_name)
     "#{table_name}.#{name} (#{info_hash.fetch(:type)})"
   end
 

data/lib/dba/dump.rb

@@ -3,7 +3,9 @@
 class DBA::Dump < DBA::Command
   ADAPTERS = {
     'csv' => :CSV,
+    'jsonl' => :LDJSON,
     'ldjson' => :LDJSON,
+    'ndjson' => :LDJSON,
     'yml' => :YAML,
     'yaml' => :YAML
   }

data/lib/dba/load.rb

@@ -3,7 +3,9 @@
 class DBA::Load < DBA::Command
   ADAPTERS = {
     '.csv' => :CSV,
+    '.jsonl' => :LDJSON,
     '.ldjson' => :LDJSON,
+    '.ndjson' => :LDJSON,
     '.yml' => :YAML,
     '.yaml' => :YAML
   }
@@ -26,7 +28,7 @@ class DBA::Load < DBA::Command
 
   def file_list(path)
     if File.directory?(path)
-      Dir.glob(File.join(path, '*.{csv,ldjson,yml,yaml}'))
+      Dir.glob(File.join(path, '*.{csv,jsonl,ldjson,ndjson,yml,yaml}'))
     else
       [path]
     end

data/lib/dba/printer.rb

@@ -57,8 +57,8 @@ class DBA::Printer
     schema_hash.each do |column_name, info_hash|
       fields = []
       fields << "#{table_name}.#{column_name}"
-      fields << muted(info_hash[:type] || info_hash[:db_type])
-      fields << muted('(primary key)') if info_hash[:primary_key]
+      fields << muted(format_column_type(info_hash))
+      fields << muted('{primary}') if info_hash[:primary_key]
 
       io.puts fields.join(' ')
     end
@@ -68,9 +68,12 @@ class DBA::Printer
 
   def print_indexes(indexes)
     indexes.each do |index_name, info_hash|
-      columns = info_hash.fetch(:columns).map(&:to_s).join(', ')
+      fields = []
+      fields << index_name
+      fields << muted('(' + info_hash.fetch(:columns).map(&:to_s).join(', ') + ')')
+      fields << muted('{unique}') if info_hash[:unique]
 
-      io.puts "#{index_name} (#{columns})"
+      io.puts fields.join(' ')
     end
   end
 
@@ -96,6 +99,12 @@ class DBA::Printer
     end
   end
 
+  def format_column_type(info_hash)
+    return info_hash[:db_type] unless info_hash[:type]
+    return info_hash[:type] unless info_hash[:db_type]&.end_with?('[]')
+    info_hash[:type].to_s + '[]'
+  end
+
   def null
     @null ||= muted('NULL')
   end

data/lib/dba/select.rb

@@ -0,0 +1,14 @@
+class DBA::Select < DBA::Command
+  def call(table, column, value)
+    self.table_name = table
+
+    column_name = column.to_sym
+
+    rows = database[table_name].where(column_name => value)
+
+    rows.each do |row|
+      printer.print(row)
+      printer.print_line
+    end
+  end
+end

data/lib/dba/shell.rb

@@ -16,11 +16,7 @@ module DBA::Shell
 
     command = DBA.const_get(command)
 
-    arity = command.instance_method(:call).arity
-
-    if arity >= 0 && args.size != arity
-      raise DBA::Error, "incorrect number of args (given #{args.size}, expected #{arity})"
-    end
+    command.arity_check(args)
 
     database = DBA::Database.connect
 
@@ -43,6 +39,7 @@ module DBA::Shell
       'pull' => :Pull,
       'sample' => :Sample,
       'schema' => :Schema,
+      'select' => :Select,
       'tables' => :Tables
     }
   end

data/lib/dba.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 TIMCRAFT
+# Copyright (c) 2019-2022 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: 1.1.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2022-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -89,6 +89,7 @@ files:
 - lib/dba/row_parser.rb
 - lib/dba/sample.rb
 - lib/dba/schema.rb
+- lib/dba/select.rb
 - lib/dba/shell.rb
 - lib/dba/table_command.rb
 - lib/dba/table_schema.rb
@@ -106,14 +107,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: See description