pg_graph 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a1200417e14fc1e9dae71d0243e78da8a1ee4be0a3929b0a0c118dd46bacd98
-  data.tar.gz: 4e8fd62d6ea2846966bb4c7f0f2ec2109eb8ba777d9585616d52794eb7f28e5f
+  metadata.gz: 28f5cb17edb384621612f29426084e14f15db45572e5ba80482776b4ca04b3ce
+  data.tar.gz: e2b1cf4db09e79d2a2d726dbd4ecdaa22fc82ddc4fbd94e9b10cb15220712096
 SHA512:
-  metadata.gz: d06d31762eeb3497b7cac9770766635bb2385b5025325037d839145c9d044bb6f477898aaa9c96d5f51183cd389b65d164e515eb90548f505f790b654aaffdb1
-  data.tar.gz: fc2fddb0fd4291713d9b646ba369176cc5956bc3e326aff51b36535bb9ec0d564ef0592788e05474e62ac0b69f038b41db652ca5b1717e5caf73628ffb4234c8
+  metadata.gz: 27ab8c10fbf8717e6086983cab0ce5cc32908c41c4d66402031a5bbac12b9ea623f095a4d9a9b6ac02018b34eac6dc2718be50c7c6449698008ea2b348baa4be
+  data.tar.gz: 8eca990262bb1e8fde6e5dcab49a40a2677ce368528d9485e4742c924cab1225994ac68d9e8f507f18e671ca413998cb73819b2a671cc2476dd850444754979e

data/Gemfile

@@ -5,3 +5,8 @@ gemspec
 
 gem "rake", "~> 12.0"
 gem "rspec", "~> 3.0"
+
+gem 'shellopts', :github => 'clrgit/shellopts', branch: "master"
+gem 'pg_conn', :github => 'clrgit/pg_conn', branch: "master"
+gem 'pg_meta', :github => 'clrgit/pg_meta', branch: "master"
+

data/exe/pg_graph

@@ -6,8 +6,21 @@ require "pg_graph/timer.rb"
 
 include ShellOpts
 
-PROGRAM = File.basename($PROGRAM_NAME)
 SPEC = %(
+  @ Load, dump, and clean databases
+
+  pg_graph is a utility that uses the PgGraph module to load, dump, or clean a
+  database. It uses a variety of formats that can be executed by psql(1)
+  ('psql') or by the Postgres library exec() call ('exec', 'sql'). It can also
+  read and write Yaml data ('yaml'). The dump command can also write the meta
+  data and type of the database in yaml format which is useful for debugging. 
+  
+  The default is to dump the type in yaml format, this is also the typical use
+  of pg_graph because dump of data is better done using 'pg_dump -a <database>'
+  except in the special case when the data contains circular foreign-key
+  constraints and the load command is run by an ordinary user. The load command
+  is useful when you want to read Yaml data from other programs into the database
+
   -m,meta=EFILE @ Load meta data from YAML file
     Make pg_graph loads its meta data in YAML format from FILE instead of
     querying the database
@@ -22,15 +35,25 @@ SPEC = %(
   -f,format=FORMAT:sql,exec,psql,yaml
     Input/output format. Can be one of 'sql', 'exec', 'psql', or 'yaml' (default)
 
+    The 'psql' format is meant to be fed to the psql(1) command and contains
+    psql(1) meta-commands to silence the output and to terminate on any error.
+    The 'sql' format expects the database triggers to have been disabled
+    beforehand while the 'exec' format includes statements to disble triggers.
+    The 'exec' format also resets serials
+
+    The yaml format only contains the data and can be loaded by pg_graph.
+    Triggers will be disabled while loading and ID's restored afterwards
+
   -k,kind=KIND:meta,type,data
     Output kind. Can be one of 'meta', 'type' (the default), or 'data'
 
   -t,time
-      Emit timings for process
+    Emit timings for process
 
-  load! -- [FILE] DATABASE
+  load! -- DATABASE [FILE]
     Loads data into the database. The file format is determined by the file's
-    extension but can also be set explicitly using the --format option.
+    extension but can also be set explicitly using the --format option. Reads
+    from standard input if FILE is missing
 
   dump! -- DATABASE 
     Dumps data on standard output. Default is to dump the type system in yaml
@@ -61,20 +84,14 @@ def load_type(timer, opts, database)
   [connection, type]
 end
 
-opts, args = ShellOpts::ShellOpts.process(SPEC, ARGV)
+opts, args = ShellOpts::ShellOpts.process(SPEC, ARGV, :version => PgGraph::VERSION)
 
 timing = opts.time?
 timer = Timer::Timer.new
 
-# Process options
-meta = opts.meta
-reflections = opts.reflections
-kind = opts.kind || "type"
-format = opts.format || "yaml"
-
 case opts.subcommand || :dump!
   when :load!
-    database = args.expect(-1)
+    database = args.extract(1)
     file = args.expect(0..1) || "/dev/stdin"
 
     if opts.format?
@@ -112,7 +129,7 @@ case opts.subcommand || :dump!
   when :dump!
     database = args.expect(1)
 
-    case kind
+    case opts.kind || "type"
       when "meta"
         connection = timer.time("connect") { PgConn.new(database) if !opts.meta? }
         meta = timer.time("meta") { opts.meta? ? PgMeta.load_file(opts.meta) : PgMeta.new(connection) }
@@ -124,7 +141,7 @@ case opts.subcommand || :dump!
         connection, type = load_type(timer, opts, database)
         data = timer.time("instantiate") { type.instantiate(connection) }
         timer.time("dump") {
-          case format
+          case opts.format || "yaml"
             when "sql"; puts data.to_sql
             when "exec"; puts data.to_exec_sql
             when "psql"; puts data.to_psql_sql

data/lib/pg_graph/inflector.rb

@@ -86,7 +86,8 @@ module PgGraph
       case name
         when "character varying", "varchar", "text", "uuid"; String
         when "smallint", "integer", "int4", "int2"; Integer
-        when "double precision", "float8", "numeric"; Float
+        when "double precision", "real"; Float
+        when "numeric", "decimal"; BigDecimal
         when "bool", "boolean"; Boolean
         when "json"; Hash
         when "bytea"; String
@@ -97,7 +98,7 @@ module PgGraph
       end
     end
 
-    SUPPORTED_RUBY_CLASSES = [String, Integer, Float, Boolean, Hash, Time, NilClass, Array]
+    SUPPORTED_RUBY_CLASSES = [String, Integer, Float, BigDecimal, Boolean, Hash, Time, NilClass, Array]
   end
 
   def self.inflector() @inflector ||= Inflector.new end

data/lib/pg_graph/version.rb

@@ -1,3 +1,3 @@
 module PgGraph
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/pg_graph.gemspec

@@ -28,12 +28,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "constrain"
   spec.add_dependency "developer_exceptions"                                                                         
   spec.add_dependency "dry-inflector"
-  spec.add_dependency "hash_tree", "= 0.1.1"
   spec.add_dependency "indented_io"
-  spec.add_dependency "shellopts", "2.0.6"
 
-  spec.add_dependency "pg_conn", "= 0.2.1"
-  spec.add_dependency "pg_meta", "0.1.0"
+  spec.add_dependency "hash_tree"
+  spec.add_dependency "shellopts", "~> 2.0.9"
+  spec.add_dependency "pg_conn"
+  spec.add_dependency "pg_meta"
 
   # Also un-comment in spec/spec_helper to use simplecov
   # spec.add_development_dependency "simplecov"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_graph
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-02 00:00:00.000000000 Z
+date: 2022-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boolean
@@ -67,21 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hash_tree
+  name: indented_io
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: indented_io
+  name: hash_tree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -98,44 +98,44 @@ dependencies:
   name: shellopts
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.9
 - !ruby/object:Gem::Dependency
   name: pg_conn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pg_meta
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: '0'
 description: dwpg_graph gem
 email:
 - claus.l.rasmussen@gmail.com
@@ -198,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Create graph type model of database