prick 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8acf851da65b094d2abab5a6d9469f20a974732b9e8a8f5bbc4542f72bf8dae
-  data.tar.gz: d7ce7beb146b47aea6f25a93771b206a41434bd2ecbd3a1df33b8580374e29ea
+  metadata.gz: 49ed6762f3557cc979f89bb1aaee3d5aa1d8d11a5ba9c7880a8b692d917dc733
+  data.tar.gz: 16436521e2f9a51ed6c2076ba2a54f968735868a711d170253691a69a4b34fb4
 SHA512:
-  metadata.gz: b861e5129259bcb0dd384ba7e3c2db09c826cd50105ec514bda309268779e56458a99a3ef8ca1b83226accf7ce6569b957790e5c4374473a3cfb3700ba5ef380
-  data.tar.gz: 6c1b7227ffa63e49825f4acb503d855b9110f18224c1b3f2f7b27b72a92ac0eb3865ea8926470995a71988cb64ab9aa4a5bb26420adafd152364fd31ee28d23a
+  metadata.gz: eedba5e0757b8f19c94d4bf898ea156b93090cd2466e333860d7a4da9ce91d75fbc4acab596bbc06b0a8f260909c9770715299c55040c017d45b7f679d5528f0
+  data.tar.gz: 7d98f2a0a8e6ed8230bc44b3d16d1c46f4baa85956bdbcd893325e2d062d8a6d46c4277cf85af8c5e833fb20bbf8324a75d8788d05418cd87185976c6c16a76a

data/exe/prick

@@ -150,6 +150,12 @@ SPEC = %(
       different data sets
 
       # TODO: A --clean option that resets data
+      #
+
+  snapshot!
+      Records maximum ID for all tables and stores them in prick.snapshot. It is
+      used by 'drop data' to reset data to the point in time of the snapshot.
+      Only one snapshot can be created at a time
 
   version!
       Print project version
@@ -296,7 +302,6 @@ begin
   database = state.database
   username = state.username
   environment = state.environment
-
   # Process subcommands
   case opts.subcommand
     when :version!
@@ -379,12 +384,18 @@ begin
           step: cmd.step?, timer: cmd.time?, dump: dump, schema: cmd.schema)
 
     when :bash!
+      args.expect(0)
       Prick::SubCommand.bash(main: cmd.main?)
 
     when :fox!
       require_db
       Prick::SubCommand.fox(database, username, args)
 
+    when :snapshot!
+      require_db
+      args.expect(0)
+      Prick::SubCommand.snapshot(database, username)
+
     when :drop!
       case cmd.subcommand
         when :users!
@@ -400,7 +411,9 @@ begin
           database = args.expect(0..1) || database
           Prick::SubCommand.drop_database(database)
         when :data!
-          raise NotImplementedError
+          args.expect(0)
+          require_db
+          Prick::SubCommand.drop_data(database)
         when :schema!
           require_db
           schemas = args.to_a

data/lib/prick/share/init/schema/prick/tables.sql

@@ -35,3 +35,12 @@ create table builds (
   make_duration float -- Duration of enclosing make script
 );
 
+create table snapshots (
+  id integer generated by default as identity primary key,
+  schema_name varchar not null,
+  table_name varchar not null,
+  max_id integer, -- may be null
+
+  unique(schema_name, table_name)
+);
+

data/lib/prick/subcommand/prick-drop.rb

@@ -41,6 +41,35 @@ module Prick::SubCommand
     State.connection { |conn| conn.rdbms.drop database }
   end
 
+  # Drop data not in snapshot
+  def self.drop_data(database, schemas = nil)
+    conn = Prick.state.conn
+    conn.session.triggers(false) {
+      if schemas.nil?
+        builder = Prick::Build::Builder.new(conn, Prick.state.schema_dir)
+        pool = builder.pool
+        schemas = pool.refresh_schemas
+      end
+      schema_list = conn.quote_literal_list(schemas)
+      schema_expr = schemas ? "true = true" : "schema_name in #{schema_list}"
+      tables = conn.tuples %(
+        select schema_name, table_name, max_id 
+        from prick.snapshots
+        where #{schema_expr}
+      )
+      tables.each { |schema, table, max_id|
+        uid = "#{schema}.#{table}"
+        if max_id
+          conn.exec "delete from #{uid} where id > #{max_id}"
+          conn.schema.set_serial(schema, table, max_id) if conn.schema.sequence(schema, table)
+        else
+          conn.exec "delete from #{uid}"
+          conn.schema.set_serial(schema, table, nil) if conn.schema.sequence(schema, table)
+        end
+      }
+    }
+  end
+
   # Empty the database
   def self.drop_schema(database, schemas = [])
     constrain database, String

data/lib/prick/subcommand/prick-run.rb

@@ -65,7 +65,7 @@ module Prick::SubCommand
             end
           end
 
-          # Write-back schema to builder
+          # Write back schema to builder
           builder.root.schema = schema
 
           # Drop schema if needed

data/lib/prick/subcommand/prick-snapshot.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+
+require_relative '../builder/builder.rb'
+
+module Prick::SubCommand
+  def self.snapshot(
+      database, username, 
+      builddir: Prick.state.schema_dir)
+
+    conn = Prick.state.connection
+    builder = Prick::Build::Builder.new(conn, builddir)
+    pool = builder.pool
+    schemas = pool.refresh_schemas
+
+    # Clear snapshots table
+    conn.exec "delete from prick.snapshots"
+
+    # Fill it again
+    records = []
+    for schema in schemas
+      conn.schema.list_tables(schema).each { |table|
+        max_id = conn.value "select max(id) from #{schema}.#{table}"
+        records << { schema_name: schema, table_name: table, max_id: max_id}
+      }
+    end
+    conn.insert("prick", "snapshots", records)
+  end
+end
+

data/lib/prick/subcommand/subcommand.rb

@@ -1,4 +1,4 @@
-module Prick::Subcommand 
+module Prick::SubCommand 
 # def self.parse_username_database
 #   case username_database
 #     when nil

data/lib/prick/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Prick
-  VERSION = "0.35.0"
+  VERSION = "0.36.0"
 end

data/lib/prick.rb

@@ -53,6 +53,7 @@ require_relative 'prick/subcommand/prick-release.rb'
 require_relative 'prick/subcommand/prick-run.rb'
 require_relative 'prick/subcommand/prick-set.rb'
 require_relative 'prick/subcommand/prick-setup.rb'
+require_relative 'prick/subcommand/prick-snapshot.rb'
 require_relative 'prick/subcommand/prick-teardown.rb'
 
 module Prick

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-28 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -233,6 +233,7 @@ files:
 - lib/prick/subcommand/prick-run.rb
 - lib/prick/subcommand/prick-set.rb
 - lib/prick/subcommand/prick-setup.rb
+- lib/prick/subcommand/prick-snapshot.rb
 - lib/prick/subcommand/prick-teardown.rb
 - lib/prick/subcommand/subcommand.rb
 - lib/prick/version.rb