dba 2.2.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff91c96a26c84120b2294eaceafbc9cd97d50ae7b8138ed08657efe355fe905b
-  data.tar.gz: 1e25615aea3aab8f5820f790d038363ea2854488e950d3925e48953d1055006c
+  metadata.gz: 74ad1c9318dc8528558d79b8e4705689f883c109724a6f184a392bfab3c3996f
+  data.tar.gz: f344a83c6abd29713f6975ab50fc524cdfa618a2df9be9de990ed8dd3a371ebf
 SHA512:
-  metadata.gz: b77b8fe626319fe20ac77cb31bb5bd2ed349438ea76ef6472b7367e22a804d1027a99744bde3ad2e32e7104f88a52b125a49f32c40223095281f648f150c8f64
-  data.tar.gz: 21d2f2a661aacc27375c7e9031c1057471ca627f0fb1bcb2c47dc051096e9d15d507d186854bb2fbac2b9851ba63ef2c807d7f91814ecd9490c564c6e073bdf1
+  metadata.gz: 98370ebd4bc8ee85bd617dbe6bf91d9e641d08ad29a3bc833625f1f3f0f527f622ed5620c43f8c174faa7c57527a38ea2d8ffcf74eef9708f7c33d04d9bd95ac
+  data.tar.gz: 255c954574e9545968238a5c7ddb2fd6fc11bad9379792f1b58dc0ee2e4d15591134d7be85f77b2d17d32d62b5e598261935a4cbc65d16d0796a93b4b2d2a0cd

data/CHANGES.md

@@ -1,3 +1,17 @@
+# 2.4.0
+
+* **Required ruby version is now 3.1.0**
+
+* Added bigdecimal gem dependency
+
+
+# 2.3.0
+
+* Added diagram command for generating diagrams with Graphviz, DBML, or PlantUML
+
+* Usage is now printed to STDOUT instead of STDERR
+
+
 # 2.2.0
 
 * Fixed compatibility with psych 4+

data/README.md

@@ -18,6 +18,7 @@ You can connect to any database supported by [sequel](https://rubygems.org/gems/
     $ dba
     Usage: dba COMMAND
 
+      dba diagram [PATH]
       dba diff URL
       dba dump TABLE EXTENSION
       dba edit TABLE IDENTIFIER
@@ -28,7 +29,7 @@ You can connect to any database supported by [sequel](https://rubygems.org/gems/
       dba sample TABLE [COLUMN]
       dba schema [TABLE]
       dba select TABLE COLUMN VALUE
-      dba tables 
+      dba tables
 
 
 ## ERROR: could not find database

data/dba.gemspec

@@ -1,18 +1,19 @@
 Gem::Specification.new do |s|
   s.name = 'dba'
-  s.version = '2.2.0'
+  s.version = '2.4.0'
   s.license = 'GPL-3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
-  s.email = ['mail@timcraft.com']
+  s.email = ['email@timcraft.com']
   s.homepage = 'https://github.com/readysteady/dba'
   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.5.0'
-  s.add_dependency('zeitwerk', '~> 2', '>= 2.2')
-  s.add_dependency('sequel', '~> 5')
-  s.add_dependency('pastel', '~> 0')
+  s.required_ruby_version = '>= 3.1.0'
+  s.add_dependency 'bigdecimal', '~> 3'
+  s.add_dependency 'pastel', '~> 0'
+  s.add_dependency 'sequel', '~> 5'
+  s.add_dependency 'zeitwerk', '~> 2'
   s.require_path = 'lib'
   s.executables = ['dba']
 end

data/lib/dba/database.rb

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

data/lib/dba/dbml_printer.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class DBA::DBMLPrinter < DBA::DiagramPrinter
+  def print_table_start(name)
+    @io.puts "Table #{name} {"
+  end
+
+  def print_table_end(name)
+    @io.puts '}'
+  end
+
+  def print_column(name, type)
+    @io.puts "  #{name} #{type}"
+  end
+
+  def print_foreign_key(table, column, other_table, other_column)
+    @io.puts %{Ref: #{table}.#{column} > #{other_table}.#{other_column}}
+  end
+end

data/lib/dba/diagram.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class DBA::Diagram < DBA::Command
+  PRINTERS = {
+    '.dbml' => :DBMLPrinter,
+    '.dot' => :DOTPrinter,
+    '.gv' => :DOTPrinter,
+    '.pu' => :PlantUMLPrinter,
+    '.puml' => :PlantUMLPrinter,
+  }
+
+  def call(path = nil)
+    if path.nil?
+      printer = DBA::DOTPrinter.new
+      printer.print_diagram(database)
+    else
+      extension = File.extname(path)
+
+      printer = PRINTERS.fetch(extension) { raise DBA::Error, 'unsupported file extension' }
+      printer = DBA.const_get(printer)
+
+      File.open(path, 'w+') do |file|
+        printer = printer.new(file)
+        printer.print_diagram(database)
+      end
+    end
+  end
+end

data/lib/dba/diagram_printer.rb

@@ -0,0 +1,67 @@
+class DBA::DiagramPrinter
+  def initialize(io = STDOUT)
+    @io = io
+  end
+
+  def print_diagram(database)
+    print_start
+
+    @primary_keys = {}
+
+    table_names = database.tables
+
+    table_names.each do |name|
+      schema_hash = database.schema(name)
+
+      print_table(name, schema_hash)
+    end
+
+    table_names.each do |table|
+      database.foreign_key_list(table).each do |hash|
+        column = hash.fetch(:columns).first
+
+        other_table = hash.fetch(:table)
+
+        other_column = @primary_keys.fetch(other_table)
+
+        print_foreign_key(table, column, other_table, other_column)
+      end
+    end
+
+    print_end
+  end
+
+  def print_start
+  end
+
+  def print_end
+  end
+
+  def print_table(name, schema_hash)
+    print_table_start(name)
+
+    schema_hash.each do |column_name, info_hash|
+      column_type = info_hash[:type] || info_hash[:db_type]
+
+      if info_hash[:primary_key]
+        @primary_keys[name] = column_name
+      end
+
+      print_column(column_name, column_type)
+    end
+
+    print_table_end(name)
+  end
+
+  def print_table_start(name)
+  end
+
+  def print_table_end(name)
+  end
+
+  def print_column(name, type)
+  end
+
+  def print_foreign_key(table, column, other_table, other_column)
+  end
+end

data/lib/dba/dot_printer.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+class DBA::DOTPrinter < DBA::DiagramPrinter
+  def print_start
+    @io.puts 'digraph database {'
+    @io.puts '  graph[rankdir="LR",ranksep=1.5,nodesep=0.5];'
+    @io.puts '  node[shape="Mrecord",fontname="Helvetica,Arial,sans-serif"];'
+  end
+
+  def print_end
+    @io.puts '}'
+  end
+
+  def print_table(name, schema_hash)
+    label = [name]
+
+    schema_hash.each do |column_name, info_hash|
+      column_type = info_hash[:type] || info_hash[:db_type]
+
+      if info_hash[:primary_key]
+        @primary_keys[name] = column_name
+
+        label << "{<#{column_name}>#{column_name}|#{column_type}}"
+      else
+        label << "{#{column_name}|<#{column_name}>#{column_type}}"
+      end
+    end
+
+    label = label.join('|')
+
+    @io.puts %{  #{name}[label="#{label}"];}
+  end
+
+  def print_foreign_key(table, column, other_table, other_column)
+    @io.puts %{  #{table}:#{column} -> #{other_table}:#{other_column};}
+  end
+end

data/lib/dba/plant_uml_printer.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class DBA::PlantUMLPrinter < DBA::DiagramPrinter
+  def print_start
+    @io.puts '@startuml'
+    @io.puts 'left to right direction'
+  end
+
+  def print_end
+    @io.puts '@enduml'
+  end
+
+  def print_table_start(name)
+    @io.puts "map #{name} {"
+  end
+
+  def print_table_end(name)
+    @io.puts '}'
+  end
+
+  def print_column(name, type)
+    @io.puts "  #{name} => #{type}"
+  end
+
+  def print_foreign_key(table, column, other_table, other_column)
+    @io.puts %{#{table}::#{column} *-> #{other_table}::#{other_column}}
+  end
+end

data/lib/dba/shell.rb

@@ -30,6 +30,7 @@ module DBA::Shell
 
   def commands
     {
+      'diagram' => :Diagram,
       'diff' => :Diff,
       'dump' => :Dump,
       'edit' => :Edit,
@@ -55,7 +56,7 @@ module DBA::Shell
   end
 
   def print_usage
-    printer = DBA::Printer.new(STDERR)
+    printer = DBA::Printer.new
     printer.print_usage(program_name, command_parameters)
 
     Kernel::exit(1)

data/lib/dba.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2024 TIMCRAFT
+# Copyright (c) 2019-2025 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
@@ -18,9 +18,12 @@ module DBA
   loader = Zeitwerk::Loader.new
   loader.tag = File.basename(__FILE__, '.rb')
   loader.inflector.inflect({
-    'dba' => 'DBA',
     'csv' => 'CSV',
+    'dba' => 'DBA',
+    'dbml_printer' => 'DBMLPrinter',
+    'dot_printer' => 'DOTPrinter',
     'ldjson' => 'LDJSON',
+    'plant_uml_printer' => 'PlantUMLPrinter',
     'yaml' => 'YAML'
   })
   loader.push_dir(__dir__)

metadata

@@ -1,35 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: dba
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2025-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: zeitwerk
+  name: bigdecimal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
-    - - ">="
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -45,22 +53,22 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
-  name: pastel
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: Ruby command line tool for working with development databases
 email:
-- mail@timcraft.com
+- email@timcraft.com
 executables:
 - dba
 extensions: []
@@ -75,13 +83,18 @@ files:
 - lib/dba/command.rb
 - lib/dba/csv.rb
 - lib/dba/database.rb
+- lib/dba/dbml_printer.rb
+- lib/dba/diagram.rb
+- lib/dba/diagram_printer.rb
 - lib/dba/diff.rb
+- lib/dba/dot_printer.rb
 - lib/dba/dump.rb
 - lib/dba/edit.rb
 - lib/dba/find.rb
 - lib/dba/indexes.rb
 - lib/dba/ldjson.rb
 - lib/dba/load.rb
+- lib/dba/plant_uml_printer.rb
 - lib/dba/printer.rb
 - lib/dba/pull.rb
 - lib/dba/row_command.rb
@@ -107,14 +120,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: See description