prick 0.44.0 → 0.45.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e046355817f1eaf7637ad6738524e25988e26bb29cfbd5e78078cb2d30e71dc3
-  data.tar.gz: 1d0afc75efbafd486f3242b6adaa3d61ff245482facb936de29032ac87d053b5
+  metadata.gz: 939683467498ed042cfb77197ecb0edab5c0a63ad24f2e2686ac2b6a86f9b010
+  data.tar.gz: 75e47615dbe7dc04531c629bcbc6db9ec91631e98fbbeee8f5ad31f6b3d0e612
 SHA512:
-  metadata.gz: e2431481ad1746d8657b3d569e7ce75f3b00d2109639d06aa8ce3a572e5d5994b69a5325214530ec8f8ba5559baef16b5731a91ae16528ba8fa4745ced92d092
-  data.tar.gz: c69e5435b07a36a766213a22b158655310479edaa5f7e934bb019e5d0d91c62458f2f8d7c03557747057fd1f892a972a990a26267e489722d60a33d3767e05c7
+  metadata.gz: d07ee1e9a1cc5a5c5c10c4af753a5ca2d2831588f4df377dacd33d27346928b536f90eb03037f68f2c9497ac5dcdab369deb10a3aa36125a0415a6520cfeeb51
+  data.tar.gz: e2a670c6d6fac252e4505884243bca0eff469044bb6e10548c2a17bc82235785ad507db07325eab8d0b16d0ccbd1eb50146dabe110669540ca9aac174d2c9415

data/exe/prick

@@ -51,8 +51,12 @@ SPEC = %(
       given the directory will be created and the project initialized in it.
       Default name and title is derived from the directory name
 
-  setup! -- [OWNER@]DATABASE [ENVIRONMENT] @ Create and set current database
-      Create database and owner and set the current database
+      Note that no files are copied currently :-O
+
+  setup! --prick -- [OWNER@]DATABASE [ENVIRONMENT] @ Create and set current database
+      Create database and owner and set the current database. The --prick
+      option creates the database or clears an existing database before
+      rebuilding the prick schema. It is used to update the prick schema
 
   teardown! -- [DATABASE...] @ Remove database and owner
       Drop database, database users, and database owner if possible and not the
@@ -91,6 +95,9 @@ SPEC = %(
       that you can have multiple databases and switch between them using the
       'set database' subcommand
 
+  create.prick! -- (Re-)initialize the prick schema
+      Create the prick schema. The database and owner are created if needed
+
   create.migration! -f,force -o,file=FILE -- VERSION @ Create migration
       Create a migration from VERSION to the current and write it to
       migration/VERSION. Fails if migration exist unless the --force flag is
@@ -233,8 +240,10 @@ SPEC = %(
 def require_db(database = Prick.state&.database, exist: true)
   database or raise ArgumentError
   dba = State.connection
+
   if exist
     dba.rdbms.exist?(database) or Prick.error "Can't find database '#{database}'"
+
     if Prick.state&.connection&.name == database
       close_conn = false
       conn = Prick.state.conn
@@ -267,7 +276,7 @@ def parse_database_args(state, args)
       username = database
     end
   else
-    database = state.name
+    database = state.database
     username = database
   end
   database or Prick.error "Database is undefined"
@@ -394,6 +403,15 @@ begin
           database, username, environment = parse_database_args(state, args)
           require_db(database, exist: false)
           Prick::SubCommand.create_database(database, username, environment)
+        when :prick!
+          clean_pg_meta_cache
+          database, username, environment = parse_database_args(state, args)
+          if Prick::SubCommand.exist_database?(database)
+            Prick::SubCommand.clean(database, exclude: [])
+            Prick::SubCommand.init_database(database, username, environment)
+          else
+            Prick::SubCommand.create_database(database, username, environment)
+          end
         when :migration!
           # clean_pg_meta_cache # FIXME ?
           require_db
@@ -403,10 +421,10 @@ begin
               username, version,
               force: create_command.subcommand!.force?,
               file: create_command.subcommand!.file)
-        when :users, :schema, :data, :all
+        when :users!, :schema!, :data!, :all!
           raise NotImplementedError
       else
-        raise ArgumentError
+        raise ArgumentError, "Unexpected subcommand #{create_command.subcommand.inspect}"
       end
 
     when :build!

data/lib/prick/share/init/schema/prick/build.yml

@@ -5,7 +5,8 @@
 # environment just to create the prick schema.  After the initial setup, the
 # scripts are only run by 'prick build' with the --force option
 #
-# This is hardcoded an should be fixed somehow
+# Note that the content of this file is hardcoded in
+# lib/prick/subcommand/prick-create.rb. This is a bug FIXME
 #
 ---
 - schema: prick

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

@@ -0,0 +1,15 @@
+-- Controlled by prick(1). Don't touch
+--
+
+create function prick.version() returns text as $$
+  select version from prick.versions;
+$$ language sql;
+
+create function prick.success() returns boolean as $$
+  select coalesce(success, false) from prick.versions;
+$$ language sql;
+
+create function prick.built_at() returns timestamp as $$
+  select coalesce(built_at, '1970-01-01 00:00:00'::timestamp from prick.versions;
+$$ language sql;
+

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

@@ -41,8 +41,10 @@ module Prick::SubCommand
 
               # Drop all schemas except the prick schema and re-creates the
               # public schema
-              builder.pool.delete_schema("prick") if super_conn.schema.exist?("prick")
-              super_conn.rdbms.empty!(database, public: false, exclude: ["prick"])
+#             builder.pool.delete_schema("prick") if super_conn.schema.exist?("prick")
+#             super_conn.rdbms.empty!(database, public: false, exclude: ["prick"])
+              super_conn.rdbms.empty!(database, public: false)
+              Prick::SubCommand::init_database(database, username)
             else
               # Find all schemas
               refresh_schemas = conn.schema.list

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

@@ -6,10 +6,10 @@ module Prick::SubCommand
   # Drop users and hollow-out database. This has the same as effect as
   # teardown+setup but without recreating the database owner and the database
   # which would otherwise terminate all user sessions
-  def self.clean(database)
-    drop_users(database)
+  def self.clean(database, exclude: %w(prick))
+    Prick::SubCommand.drop_users(database)
     State.connection { |conn|
-      conn.rdbms.empty!(database, exclude: ["prick"]) if conn.rdbms.exist?(database)
+      conn.rdbms.empty!(database, exclude: exclude) if conn.rdbms.exist?(database)
     }
   end
 end

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

@@ -1,6 +1,10 @@
 module Prick
   module SubCommand
-    PRICK_BUILD_FILES = %w(tables.sql views.sql) # HARDCODED
+    PRICK_BUILD_FILES = %w(tables.sql views.sql functions.sql) # FIXME FIXME FIXME HARDCODED
+
+    def self.exist_database?(database)
+      State.connection.rdbms.exist? database
+    end
 
     def self.create_database(database, username, environment)
       super_conn = State.connection
@@ -16,6 +20,13 @@ module Prick
       # Create database
       super_conn.rdbms.create database, owner: username
 
+      # Initialize prick schema
+      init_database database, username, environment
+    end
+
+    # Setup prick schema. Used when we rebuild the prick schema without
+    # disconnecting users
+    def self.init_database(database, username, environment)
       # Setup Prick schema. Note that this is hardcoded, the prick build file
       # is ignored
       conn = PgConn.new(database, username) # Can't use Prick.state.connection on a new database

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

@@ -27,6 +27,7 @@ module Prick::SubCommand
       else
         conn.rdbms.role.drop(users)
       end
+
     else
       # We don't terminate sessions because we assume one-database-users
       # FIXME: users is undefined

data/lib/prick/version.rb

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

data/lib/prick-command.rb

@@ -84,7 +84,6 @@ module Prick
             from information_schema.tables
             where table_schema = 'prick'
             and table_name = 'builds'
-            limit 1
         ))
         yield(database, conn) if is_prick_database && block_given?
         is_prick_database

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prick
 version: !ruby/object:Gem::Version
-  version: 0.44.0
+  version: 0.45.1
 platform: ruby
 authors:
 - Claus Rasmussen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-11-17 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: semantic
@@ -223,6 +223,7 @@ files:
 - lib/prick/share/init/schema/build.yml
 - lib/prick/share/init/schema/prick/.keep
 - lib/prick/share/init/schema/prick/build.yml
+- lib/prick/share/init/schema/prick/functions.sql
 - lib/prick/share/init/schema/prick/tables.sql
 - lib/prick/share/init/schema/prick/views.sql
 - lib/prick/share/init/schema/public/.keep