fixture_fox 0.2.7 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5d11738a008959b4da678a81352f3cf2d78c5a32dfcee362085cf9371b729ac
-  data.tar.gz: 7fc2a1f30a2b3f5a940e2454c9856e2979b71317559b1577955e2cae1b08348b
+  metadata.gz: 50051aef4f91108da08251be8bed03837c44b2fcc39c0a28156601ac8c36ddff
+  data.tar.gz: 329e39a3220f4b9503d3a25a09bafcb0ad1605bfb8e38203a8ab89766a6607eb
 SHA512:
-  metadata.gz: f34d0bf3301a95c14fc8666a86934c51e9ffc51de5016233a4567173731c1dd92827011db9b99225748dc0af26749246f177d52d98fa06df6b97989d5082cb22
-  data.tar.gz: 5df4eb70caa2e9e1f21bd018f7c30ce0d9c93b718b4c9796b28632c74f31ca2ef419441907496fe0fe079567305fa6d07abc94a23d2307f6bf2b905f1adb3afc
+  metadata.gz: 5f97dbaa8de152779d9b9b3d092b8b4ea10121d2ef79250b92f59e5a9aa9ab984108d6cb565d039e68a6c23ca6f164b243d985b0e7d855a789fe2bce5848592e
+  data.tar.gz: 19671da5508132d13cfc5a3c9c5e796ad729e1daedae4eafe63e42911c36d9cbe9f89148aaa1e0e237ee560164970f28fa9cf0ae11f75d813a236b888b5bfdde

data/exe/fox

@@ -44,6 +44,11 @@ SPEC = %(
   -x,exec
       Execute the generated SQL instead of printing it on standard output
 
+  +e,exclude=SCHEMA,
+      Exclude the given schemas. The schemas are passed on to PgGraph to
+      exclude schemas that doesn't comply with PgGraph's naming conventions,
+      typically FDW schemas. This option can be repeated
+
   -t,time
       Emit timings for sub-processes
 
@@ -67,7 +72,7 @@ begin
 
   opts.format ||= 'psql'
 
-  if opts.state? 
+  if opts.state?
     opts.state = File.expand_path(opts.state || DEFAULT_STATE_FILE)
     FileUtils.touch(opts.state) if !File.exist?(opts.state)
   end
@@ -103,8 +108,10 @@ begin
     reflector = tg.time("reflections") { PgGraph::Reflector.new }
   end
 
-  # Dump types
-  type = tg.time("type") { PgGraph::Type.new(meta, reflector) }
+  # Load types
+  type = tg.time("type") { PgGraph::Type.new(meta, reflector, ignore: opts.exclude || []) }
+
+  # Dump types?
   if opts.dump == "type"
     type.dump
     exit

data/lib/fixture_fox/analyzer.rb

@@ -211,8 +211,6 @@ module FixtureFox
     end
 
     def generate_record_ids
-#     puts "generate_record_ids"
-#     puts "  ids: #{@ids}"
       @super_table_records = [] # Array of pairs of super_table/id
       records.each { |ast_record|
         table = ast_record.type.table
@@ -270,19 +268,17 @@ module FixtureFox
       records.each { |record|
         record.members.each { |field|
           table = nil # To bring table into scope. FIXME: Yt?
+#         puts "#{field.class}"
           case field
             when AstFieldMember
-#             puts "AstFieldMember: #{field}"
               table = record.type.table
               column = field.column.postgres_column
               idr.put(table.schema.name, table.name, record.id, column, field.value.value)
             when AstReferenceMember
-#             puts "AstReferenceMember: #{field}"
               table = record.type.table
               column = field.column.postgres_column
               idr.put(table.schema.name, table.name, record.id, column, field.referenced_anchor.id)
             when AstRecordMember
-#             puts "AstRecordMember: #{record.type}"
               column = field.column
 
               this_record_id = field.record.id
@@ -300,7 +296,6 @@ module FixtureFox
                 idr.put(schema.name, table.name, that_record_id, link_column, this_record_id)
               end
             when AstTableMember
-#             puts "AstTableMember: #{field}"
               if field.column.is_a?(PgGraph::Type::MmTableColumn)
                 table = mm_table = field.column.mm_table
                 this_mm_column = field.column.this_mm_column
@@ -316,11 +311,22 @@ module FixtureFox
               else
                 table = record_table = field.column.type.table
                 record_column = field.column
+
                 field.elements.each { |r|
                   record_id = r.is_a?(AstReferenceElement) ? r.referenced_anchor.id : r.id
+                  if record_table[record_column.that_link_column].kind?
+                    key_schema_name = record_column.table.schema.name
+                    key_table_name = record_column.table.name
+                    key_record_id = record.id
+                    key_field = record_column.this_link_column.to_sym
+                    key = idr.data[key_schema_name][key_table_name][key_record_id][key_field]
+                  else
+                    key = record.id
+                  end
+
                   idr.put(
                       record_table.schema.name, record_table.name,
-                      record_id, record_column.that_link_column, record.id)
+                      record_id, record_column.that_link_column, key)
                 }
               end
             else

data/lib/fixture_fox/ast.rb

@@ -165,12 +165,3 @@ module FixtureFox
   end
 end
 
-
-
-
-
-
-
-
-
-

data/lib/fixture_fox/version.rb

@@ -1,3 +1,3 @@
 module FixtureFox
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fixture_fox
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.9
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-16 00:00:00.000000000 Z
+date: 2024-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg