postspec 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c5d89777324cedb5b8468b0c33806b45dd908b6dd7ce839bd9d3290ad9d4a0
-  data.tar.gz: 927fb7974ae6a9f7063e0b9a90e94dab313860c2e367d1b20f73e6afef645193
+  metadata.gz: 39ed181749e41623ce7791415874644656c2b44fe4a57db2241ba1dcb136cd35
+  data.tar.gz: 65c8afdda77cbc727159da796a04efa1d1b6134ca5ce198af30548cbdd2f3693
 SHA512:
-  metadata.gz: 7fb4a38a74f0af6c527605789d127243b3624cf7f7073981a69bef007087809093c0bb273f4859f80b95aa3228da061b23674ca0d012920607b1bcf7b9e8159f
-  data.tar.gz: 23df58f3ba1eb8a48af8bed88ae3fedf8e151c5cf453fa5b4c24f211faaec732480c66c5560ec3e95832baeef379a7c4621bec6636033dc93091152b70e7bcf2
+  metadata.gz: ee46e5636f9e632c126142a87bc796cbf19c29896bcb4a576b69776a50020ef30919682becece4242c97dd95897ae0ed8365fc633cd62b3416d0ade8a362a64f
+  data.tar.gz: 66d90244f8e1ac9a566112ab5e523e9804a3faf441e7a82efa64edc29b11072f4d25127147ba08d9bb330ccba6049051865dc78bd6681c43d623c49a6c814d68

data/exe/postspec

@@ -11,6 +11,11 @@ SPEC = "
 
   -r,reflections=EFILE @ Reflections file
 
+  +i,ignore=SCHEMA
+    Exclude the given schemas from the type model. This is required for schemas
+    that doesn't follow PgGraph's naming convention when there is no
+    reflections file
+
   -- DATABASE"
 
 def timeit(label = nil, &block)
@@ -33,7 +38,7 @@ puts "Reading and writing the given database"
 indent {
   conn = PgConn.new(database)
   meta = timeit("Meta") { PgMeta.new(conn) }
-  type = timeit("Type") { PgGraph::Type.new(meta, opts.reflections) }
+  type = timeit("Type") { PgGraph::Type.new(meta, opts.reflections, ignore: opts.ignore) }
   data = timeit("Read data") { PgGraph::Data.new(type, conn) }
   load_data = timeit("Write data") { data.write(conn) }
 }

data/lib/postspec/config.rb

@@ -1,38 +1,43 @@
 # Used to initialize postspec from spec/spec_helper.rb or spec/postspec_helper.rb
 #
 module Postspec
-  Config = Struct.new(:database, :mode, :reflections, :anchors, :fail_fast)
+  Config = Struct.new(:database, :mode, :reflections, :anchors, :fail_fast, :ignore)
 
   @database = nil
   @mode = nil
   @reflections = nil
   @anchors = nil
   @fail_fast = nil
+  @ignore = nil
 
   DEFAULT_MODE = :empty
   DEFAULT_FAIL_FAST = true
+  DEFAULT_IGNORE = []
 
   def self.database() @database end
   def self.mode() @mode end
   def self.reflections() @reflections end
   def self.anchors() @anchors end
   def self.fail_fast() @fail_fast end
+  def self.ignore() @ignore end
 
   def self.configure(&block)
-    config = Config.new(@database, DEFAULT_MODE, nil, nil, DEFAULT_FAIL_FAST)
+    config = Config.new(@database, DEFAULT_MODE, nil, nil, DEFAULT_FAIL_FAST, DEFAULT_IGNORE)
     yield(config)
     @database = config.database
     @mode = config.mode || DEFAULT_MODE
     @reflections = config.reflections
     @anchors = config.anchors
     @fail_fast = config.fail_fast || DEFAULT_FAIL_FAST
+    @ignore = config.ignore || DEFAULT_IGNORE # FIXME: Why not rely on Config defaults?
     self
   end
 
   def self.postspec()
     !@database.nil? or raise Error, "Database unspecified"
     @postspec ||= Postspec.new(
-        PgConn.new(@database), mode: mode, reflector: @reflections, anchors: @anchors, fail: @fail_fast)
+        PgConn.new(@database), 
+        mode: mode, reflector: @reflections, anchors: @anchors, fail: @fail_fast, ignore: @ignore)
   end
 end
 

data/lib/postspec/environment.rb

@@ -11,8 +11,9 @@ module Postspec
     end
 
     def table_sequence_ids(all: false)
+      ignore_list = "'" + (postspec.ignore + %w(prick)).join("', '") + "'"
       conn.map \
-        "select table_uid, record_id from postspec.table_sequence_ids()" +
+        "select table_uid, record_id from postspec.table_sequence_ids(array[#{ignore_list}]::varchar[])" +
         (all ? "" : " where record_id is not null")
     end
 
@@ -53,7 +54,7 @@ module Postspec
       conn.exist? "select 1 from pg_namespace where nspname = 'postspec'"
     end
 
-    # Removes excess data and meta data, and resets sequences. It doens't change any triggers
+    # Removes excess data and meta data, and resets sequences. It doesn't change any triggers
     def clean
 #     puts "Environment#clean"
       @uids = {}

data/lib/postspec/version.rb

@@ -1,3 +1,3 @@
 module Postspec
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/postspec.rb

@@ -40,6 +40,9 @@ module Postspec
     # the test run will terminate immediately. Default true
     attr_reader :fail
 
+    # List of ignored schemas
+    attr_reader :ignore
+
     # State
     attr_reader :state
 
@@ -65,13 +68,13 @@ module Postspec
     # TODO: PgMeta object
     #
     # +mode+ can be one of :seed, :empty (TODO :reseed, :keep)
-    def initialize(conn, reflector: nil, mode: :empty, anchors: [], fail: true)
-#     puts "Postspec#initialize"
+    def initialize(conn, reflector: nil, mode: :empty, anchors: [], fail: true, ignore: [])
       constrain conn, PgConn
       constrain reflector, NilClass, String, PgGraph::Reflector
       constrain mode, lambda { |m| [:empty, :seed].include?(m) }
       constrain anchors, [Hash], NilClass
       constrain fail, TrueClass, FalseClass
+      constrain ignore, [String]
 
       @conn = conn
       @meta = PgMeta.new(@conn)
@@ -82,9 +85,10 @@ module Postspec
       has_postspec = @meta.schemas.key?("postspec")
       !has_postspec or (@meta.schemas["postspec"].hidden = true)
 
-      @type = PgGraph::Type.new(@meta, reflector, ignore: ["prick"]) 
+      @type = PgGraph::Type.new(@meta, reflector, ignore: ["prick"] + ignore) 
       @render = Render.new(self)
       @tables = type.schemas.map(&:tables).flatten
+      @ignore = ignore
       @fail = fail
       @failed = false
       @success = true
@@ -217,7 +221,6 @@ module Postspec
     end
 
     def use(rspec, *files)
-
       # Closure variables
       this = self
       search_path = self.search_path

data/lib/share/postspec_schema.sql

@@ -7,11 +7,14 @@ set search_path to postspec;
 -- Return a map from table UID to last value of sequence. All user tables are
 -- included but tables without sequences (subtables) have last value set to
 -- null
-create or replace function table_sequence_ids() returns table(table_uid text, record_id bigint) as $$
+create or replace function table_sequence_ids(ignore_schemas varchar[]) 
+  returns table(table_uid text, record_id bigint) 
+as $$
   declare
     name varchar(255);
     tuple record;
   begin
+    ignore_schemas := ignore_schemas || array['information_schema', 'postspec']::varchar[];
     for tuple in 
       select  tc.relnamespace::regnamespace::text || '.' || tc.relname as table_uid,
               s.relnamespace::regnamespace::text || '.' || s.relname as sequence_uid
@@ -27,8 +30,8 @@ create or replace function table_sequence_ids() returns table(table_uid text, re
               and     coalesce(sc.relnamespace::regnamespace::text != 'postspec', true)
       ) s on s.refobjid = tc.oid
       where   tc.relkind = 'r'
-      and     tc.relnamespace::regnamespace::text not like 'pg_%' 
-      and     tc.relnamespace::regnamespace::text not in ('information_schema', 'postspec', 'prick')
+      and     tc.relnamespace::regnamespace::text not like 'pg_%'
+      and     tc.relnamespace::regnamespace::text != all(ignore_schemas)
     loop
       if tuple.sequence_uid is null then
         table_uid := tuple.table_uid;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postspec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-inflector