pg_graph 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3605f3dc16a65459725b3890e9dc85d4c7f4bf3fbdbf216526a12a1c843ef6f7
-  data.tar.gz: 34a6d5f23cf5914d43f53835f817aedb79f9699104c807d20d30fb9507633162
+  metadata.gz: 38b9eb4ca9867310cda60284befd00b8819dd91ab0f337c053a47e2045c41f35
+  data.tar.gz: f4fe9a924423df0b43b3e0609ba3075e864902ff7a6e92d1c7d2baf522065f31
 SHA512:
-  metadata.gz: e5e870b7ecd6ec71a8c0b8e5196511963402a372374efa003c522b847ec3b92ba50904c36046451930a79f6265455f0ba33f2f65547bd6b39a79ab88dc7ba30c
-  data.tar.gz: ec4d637a227f5a94beda42b2075240e9ecc1d70af3eaf1fa3c9c9c7c4d5990f269b70751985aa17482f3210c3ffbb635ed92638f8d5b5d69906c7e57fcc9526e
+  metadata.gz: f057d02742170bfb37e2fc93e6c1419c65ca8081e8543c33c497e29efa82598c9cb82ef10b3359143b7ad56482328de8c8b8e59b75749f89df940b355fe874f9
+  data.tar.gz: 37e9bc383ef07636a85740dd73350ba7dacd8b67036250b0959b41b31f4d91afef540f8ae4b841dbbbc513b50bd5b439e1b63230175a407d00cfd364302418a0

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/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))
@@ -240,7 +252,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.2"
 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.2
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-24 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boolean