pg_graph 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c276d6c75a8880b77b66f8d40346511069a635088070835903b36ae2b000401
-  data.tar.gz: fc96bb277f909cc6da83566b2151d6a30628cb143e3d2cd9ecc7af1d800dd31d
+  metadata.gz: 123eb2c8963ee6c45420315db19a876e76e5322ca7069d74e3d50fa4792aab58
+  data.tar.gz: 5be39db46db7775b25a40b02c76c65cedb8bf365128d5c3b602c1e3ca9003552
 SHA512:
-  metadata.gz: 6b5a9ef6de526ff63c3930677822eb244e7bc486fe95d4db340592ea363c91427410cd1449cb46f8f99635aa3cff6886b9b30826dcea8163a63c7d36fbad4eaa
-  data.tar.gz: eae096de222265d3d229bbc755356781bf1c7027cfdd54eec382f08c98c390bb6fe5d43ee3e47df17ef949b5b4c4d4b3e33241ebc3441f882ddcd6129f1bc82c
+  metadata.gz: d1c6a0c25c6980031763409d6357df388db14002c6c8c49b6eb92b93ac9cf180d9cfe7eb0789b622e5f2fc078f08a603b33ccb433947d0bd5c308bf16c204a0a
+  data.tar.gz: b43cfb4089d4fcffa32f62019c256065b9f3b00c1dddb47edb3c4ca490a68dfb1495dd68fd7204e3d42051aadeca7b737652a129ef6d3bdfd84ff47a2dafa44d

data/TODO

@@ -1,4 +1,5 @@
 
+o Fix that tables are not deleted in dependency order
 o Propagate super table relations to sub-tables
 o Provide a way to exclude certain schemas from the model (eg. prick/postspec/etc.)
 o Move SimpleType to PgCatalog schema

data/lib/pg_graph/data/data.rb

@@ -124,8 +124,8 @@ module PgGraph::Data
     def to_yaml() @impl.map { |k,v| [k, v.to_yaml] }.to_h end
 
     # Note that #to_sql in derived classes should be deleted FIXME
-    def to_sql(format: :sql, ids: {}, delete: :all, files: [])
-      render = SqlRender.new(self, format, ids: ids, delete: delete, files: files)
+    def to_sql(format: :sql, ids: {}, delete: :all, truncate: :none, files: [])
+      render = SqlRender.new(self, format, ids: ids, delete: delete, truncate: truncate, files: files)
       render.to_s
     end
 

data/lib/pg_graph/data/render.rb

@@ -16,7 +16,13 @@ module PgGraph::Data
     #   recursive - delete data for table in the fox file including recursively depending tables
     #   all - delete data from the whole database
     attr_reader :delete
-      
+
+    # Which data to truncate:
+    #   none - don't delete any data
+    #   touched - delete data for tables in the fox file
+    #   all - delete data from the whole database
+    attr_reader :truncate
+
     # +ids+ is a map from table UID to ID. Records with larger IDs will
     # be emitted as insert statements, records with IDs less or equal to the
     # given ID is emitted as update statements
@@ -25,10 +31,15 @@ module PgGraph::Data
     # :recursive, :all Only records with an ID greater than the corresponding
     # ID from +ids+ will be deleted
     #
+    # +truncate+ acts as +delete+ that has the major drawback that it doesn't
+    # delete records in dependency order (FIXME This is an error). You can use
+    # the SQL truncate statement instead of delete using this option but note
+    # that +ids+ should be empty for this to work
+    #
     # +files+ is a list of source file names to be included in the psql SQL
     # header as documentation. It can be set explicitly when #to_a or #to_h is
     # called (FIXME: is this used?)
-    def initialize(database, format, ids: {}, delete: :all, files: [])
+    def initialize(database, format, ids: {}, delete: :all, truncate: :none, files: [])
 #     puts "SqlRender#initialize"
 #     puts "  format: #{format.inspect}"
 #     puts "  ids: #{ids.inspect}"
@@ -36,10 +47,13 @@ module PgGraph::Data
 #     puts "  files: #{files.inspect}"
       constrain database, Database
       constrain ids, { String => Integer }
+      constrain ids.empty? || truncate == :none, true
+      constrain delete == :none || truncate == :none, true
       @database = database
       self.format = format
       (@ids = ids.dup).default = 0
       @delete = delete
+      @truncate = truncate
       @files = files
 
       @tables = database.schemas.map(&:tables).flatten.sort
@@ -79,6 +93,7 @@ module PgGraph::Data
       @to_h ||= {
         disable: render_triggers(:disable),
         delete: render_deletes(delete),
+        truncate: render_truncates(truncate),
         update: render_updates,
         insert: render_inserts,
         restart: render_restart_sequences,
@@ -90,7 +105,11 @@ module PgGraph::Data
   protected
     # Returns a single-element array of array of SQL statements
     def to_sql
-      [to_h[:delete] + to_h[:update] + to_h[:insert]]
+      if delete != :none
+        [to_h[:delete] + to_h[:update] + to_h[:insert]]
+      else
+        [to_h[:truncate] + to_h[:update] + to_h[:insert]]
+      end
     end
 
     # Returns an array of non-empty arrays of SQL statements
@@ -146,6 +165,8 @@ module PgGraph::Data
           else
             raise ArgumentError
           end
+
+      # FIXME: Not in dependency order
       table_uids.map { |uid|
         if !@ids.key?(uid)
           "delete from #{uid};"
@@ -155,6 +176,18 @@ module PgGraph::Data
       }
     end
 
+    def render_truncates(kind)
+      table_uids = 
+          case kind
+            when :none; []
+            when :touched; @tables.reject(&:empty?).map(&:uid)
+            when :all; @tables.map(&:uid)
+          else
+            raise ArgumentError
+          end
+      table_uids.map { |uid| "truncate #{uid} cascade;" }
+    end
+
     def render_updates
       @update_records.map { |record|
         "update #{record.table.uid} set " \

data/lib/pg_graph/reflector.rb

@@ -10,7 +10,7 @@ module PgGraph
     # Template for 'this' field name. Can be nil
     attr_reader :this
 
-    # Template for 'that' field name or false if the field shouldn't be
+    # Template for 'that' field name or false if the field should not be
     # included in the model. Can be nil
     attr_reader :that
 

data/lib/pg_graph/version.rb

@@ -1,3 +1,3 @@
 module PgGraph
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

data/lib/pg_graph.rb

@@ -6,12 +6,12 @@ require "date"
 
 require "boolean"
 require "constrain"
+require "forward_to"; include ForwardTo
 require "developer_exceptions"
 
 require "hash_tree"
 
 require "pg_graph/ext/meta.rb"
-require "pg_graph/ext/module.rb"
 
 require "pg_graph/version.rb"
 require "pg_graph/inflector.rb"

data/pg_graph.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "shellopts"
   spec.add_dependency "pg_conn"
   spec.add_dependency "pg_meta"
+  spec.add_dependency "forward_to"
 
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_graph
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-24 00:00:00.000000000 Z
+date: 2024-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: boolean
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: forward_to
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -206,7 +220,6 @@ files:
 - lib/pg_graph/data/render.rb
 - lib/pg_graph/data/value.rb
 - lib/pg_graph/ext/meta.rb
-- lib/pg_graph/ext/module.rb
 - lib/pg_graph/inflector.rb
 - lib/pg_graph/reflector.rb
 - lib/pg_graph/timer.rb
@@ -240,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.18
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Create graph type model of database

data/lib/pg_graph/ext/module.rb

@@ -1,18 +0,0 @@
-class Module
-  # Forward list of methods to object. The arguments should be strings or symbols
-  def forward_method(object, *methods)
-    forward_to(object, *methods)
-  end
-
-  # Same but with a better name
-  def forward_to(object, *methods)
-    for method in Array(methods).flatten
-      if method =~ /=$/
-        class_eval("def #{method}(arg) #{object}&.#{method}(arg) end")
-      else
-        class_eval("def #{method}(*args, &block) #{object}&.#{method}(*args, &block) end")
-      end
-    end
-  end
-end
-