pg_graph 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3605f3dc16a65459725b3890e9dc85d4c7f4bf3fbdbf216526a12a1c843ef6f7
-  data.tar.gz: 34a6d5f23cf5914d43f53835f817aedb79f9699104c807d20d30fb9507633162
+  metadata.gz: c459728a41d81e623602fa57ad501d0471e674b398964a4c462b35ba38753fa4
+  data.tar.gz: c2f31952b99c64e13c197faff4f63b5c6dd0d2cbbc8e57fdd8afb8d3383d67a9
 SHA512:
-  metadata.gz: e5e870b7ecd6ec71a8c0b8e5196511963402a372374efa003c522b847ec3b92ba50904c36046451930a79f6265455f0ba33f2f65547bd6b39a79ab88dc7ba30c
-  data.tar.gz: ec4d637a227f5a94beda42b2075240e9ecc1d70af3eaf1fa3c9c9c7c4d5990f269b70751985aa17482f3210c3ffbb635ed92638f8d5b5d69906c7e57fcc9526e
+  metadata.gz: d4fe21aead7e99b9196586701edc291d521c5a71b4d94e1fdbe32b87471845bcaf34bbf802751cc86ccd80b4107f6a39f5f1138f0ded644b7480db92c64ebe4c
+  data.tar.gz: e30768a57d8c0fec136af5f772b1584f91a5cf0cf7f2616297d3eeb4a40e36cbbc7e42cd005f37a6f5540730e5b4db00ee7ce580e27a1aedd67513802fecb1c1

data/exe/pg_graph

@@ -11,6 +11,8 @@ include ShellOpts
 SPEC = %(
   @ Load, dump, and clean databases
 
+  -- DATABASE
+
   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

data/lib/pg_graph/data/render.rb

@@ -213,7 +213,8 @@ module PgGraph::Data
 
     def render_inserts
       @insert_records.map { |table, records|
-        "insert into #{table.uid} (#{table.type.value_columns.map(&:name).join(', ')}) values " + \
+        "insert into #{table.uid} (#{table.type.value_columns.map(&:name).join(', ')})" + \
+        " overriding system value values " + \
         records.sort_by(&:id).map { |record|
           "(" +
               record.type.value_columns.map { |column_type|

data/lib/pg_graph/reflector.rb

@@ -2,6 +2,12 @@
 require 'constrain'
 require 'indented_io'
 
+def putv(*variables)
+  for var in Array(variables)
+    puts "#{var}: #{self.send(var).inspect}"
+  end
+end
+
 module PgGraph
   class Reflection
     # Textual representation of match RE (String)
@@ -41,6 +47,11 @@ module PgGraph
     # True if this is a default reflection
     attr_reader :default_reflection
 
+    def dump
+      puts "Reflection"
+      indent { putv :match, :re, :this, :that, :multi?, :pluralize, :components }
+    end
+
     # +this+ and +that+ are template strings, nil, or false
     def initialize(match, this, that, multi = nil, pluralize = nil, default_reflection = false)
       constrain match, Regexp, String
@@ -141,10 +152,11 @@ module PgGraph
 
     # Find 'that' field name for the given UID by searching through reflections
     # for a match. The name is pluralized if the matcher returns true or if the
-    # matcher returns nil and unique is false The :table option can be used to
+    # matcher returns nil and unique is false. The :table option can be used to
     # override the table name in '$$' rules. This is used in N:M and M:M
-    # relations. Returns nil if no match was found or if a matching reflection
-    # has #continue equal to false
+    # relations. Returns false if the :that property is set to false in the
+    # reflections file. Returns nil if no match was found or if a matching
+    # reflection has #continue equal to false
     def that(uid, unique, multi = false, table: nil)
       constrain uid, String
       if (name, pluralize = do_match(uid, :that, multi, table: table))
@@ -202,6 +214,7 @@ module PgGraph
       conn.exec %(
         insert into #{schema}.#{table}
             (match, this, that, multi, pluralize, default_reflection, ordinal)
+        overriding system value
         values
           #{values}
       )
@@ -240,7 +253,7 @@ module PgGraph
         match_data = reflection.re.match(uid) or next
         template = reflection.send(kind).dup
         if template == false
-          return nil
+          return [false, false]
         elsif template
           table ||= uid.split(".")[-2]
           template.gsub!(/\$\$/, table)

data/lib/pg_graph/type/read.rb

@@ -144,10 +144,10 @@ module PgGraph::Type
         else
           multi = reference_count[this_record_type][that_record_type] > 1
           name = reflector.that(uid, this_column.unique?, multi, table: this_record_type.name)
-          name ||= PgGraph.inflector.pluralize(this_column.table.name) if this_column.kind?
+          name ||= PgGraph.inflector.pluralize(this_column.table.name) if name.nil? && this_column.kind?
         end
 
-        next if name.nil?
+        next if !name
 
         # Check for name collisions
         if that_record_type.key?(name)

data/lib/pg_graph/version.rb

@@ -1,3 +1,3 @@
 module PgGraph
-  VERSION = "0.5.1"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_graph
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boolean