message-db 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 933944df84aeb9ae8e8a0d265b7ef3b95a82df0d58eceed0ca31507f96f04299
-  data.tar.gz: 307379e48df23685b9ad494315568f152b57a3481b8f17a1dcf128fabefded9c
+  metadata.gz: 1a5cb7492519fb76355201fb499ef7133d1e097af688752f4cff51505bc51e05
+  data.tar.gz: 744a8c922d0e2aeb41f5312003c7f905207308dbc771c1d40b4f7ff35dfa8117
 SHA512:
-  metadata.gz: e730605cb9dbad8cf9072df8ec1fde409edaa6765e852893117a0a99e60bd387f94a0dbd6ffc895ca69ab3180d7b4217a2858ac640b6e272dc94038510ebf2be
-  data.tar.gz: 664e88ea262afa6f2771563b0926fc406e3585c2a112534ba80270de13a55de5816b437217ed21265308a517fc45989994dfa2b54945b1472c204aeb47b5e326
+  metadata.gz: '044912f18717a75c4276231773bbcd17d5ffe6ce82c571ee96e2f0affab918cc4e026919f10b8155f7efe94f8bd198e7efe72d06599f076b8cf5fc8bb18600ad'
+  data.tar.gz: fb2724e33cdf5d203b3f097fdb955fb909fc1e87ea6930a778c84e5b7ee579eebf1df83c9eb83d4c9cdb4a9e860e28b65c7df051b80252bd2b5b349efe6479b3

data/database/VERSION.txt

@@ -1 +1 @@
-1.0.0
+1.1.4

data/database/extensions/pgcrypto.sql

@@ -1 +1 @@
-CREATE EXTENSION IF NOT EXISTS pgcrypto SCHEMA message_store;
+CREATE EXTENSION IF NOT EXISTS pgcrypto;

data/database/functions/message-store-version.sql

@@ -2,7 +2,7 @@ CREATE OR REPLACE FUNCTION message_store.message_store_version()
 RETURNS varchar
 AS $$
 BEGIN
-  RETURN '1.0.0';
+  RETURN '1.1.4';
 END;
 $$ LANGUAGE plpgsql
 VOLATILE;

data/database/functions/write-message.sql

@@ -12,8 +12,6 @@ DECLARE
   _message_id uuid;
   _stream_version bigint;
   _next_position bigint;
-  _category varchar;
-  _category_name_hash bigint;
 BEGIN
   PERFORM acquire_lock(write_message.stream_name);
 
@@ -65,8 +63,6 @@ BEGIN
     RAISE NOTICE 'data ($4): %', write_message.data;
     RAISE NOTICE 'metadata ($5): %', write_message.metadata;
     RAISE NOTICE 'expected_version ($6): %', write_message.expected_version;
-    RAISE NOTICE '_category: %', _category;
-    RAISE NOTICE '_category_name_hash: %', _category_name_hash;
     RAISE NOTICE '_stream_version: %', _stream_version;
     RAISE NOTICE '_next_position: %', _next_position;
   END IF;

data/database/install-privileges.sh

@@ -17,6 +17,9 @@ function grant-privileges {
 
   base=$(script_dir)
 
+  echo "» schema privileges"
+  psql $database -q -f $base/privileges/schema.sql
+
   echo "» messages table privileges"
   psql $database -q -f $base/privileges/table.sql
 

data/database/privileges/functions.sql

@@ -1,14 +1,15 @@
+GRANT EXECUTE ON FUNCTION gen_random_uuid() TO message_store;
+GRANT EXECUTE ON FUNCTION md5(text) TO message_store;
+
 GRANT EXECUTE ON FUNCTION message_store.acquire_lock(varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.cardinal_id(varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.category(varchar) TO message_store;
-GRANT EXECUTE ON FUNCTION message_store.gen_random_uuid() TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.get_category_messages(varchar, bigint, bigint, varchar, bigint, bigint, varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.get_last_stream_message(varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.get_stream_messages(varchar, bigint, bigint, varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.hash_64(varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.id(varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.is_category(varchar) TO message_store;
-GRANT EXECUTE ON FUNCTION md5(text) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.message_store_version() TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.stream_version(varchar) TO message_store;
 GRANT EXECUTE ON FUNCTION message_store.write_message(varchar, varchar, varchar, jsonb, jsonb, bigint) TO message_store;

data/database/privileges/schema.sql

@@ -0,0 +1 @@
+GRANT USAGE ON SCHEMA message_store TO message_store;

data/database/schema/message-store.sql

@@ -1 +1 @@
-CREATE SCHEMA IF NOT EXISTS message_store AUTHORIZATION message_store;
+CREATE SCHEMA IF NOT EXISTS message_store;

data/database/tables/messages.sql

@@ -1,5 +1,5 @@
 CREATE TABLE IF NOT EXISTS message_store.messages (
-  id UUID NOT NULL DEFAULT message_store.gen_random_uuid(),
+  id UUID NOT NULL DEFAULT gen_random_uuid(),
   stream_name text NOT NULL,
   type text NOT NULL,
   position bigint NOT NULL,

data/database/update.sh

@@ -2,170 +2,17 @@
 
 set -e
 
-function script_dir {
-  val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-  echo "$val"
-}
-
-base=$(script_dir)
-
-echo
-echo "Updating Database"
-echo "Version: $(cat $base/VERSION.txt)"
-echo "= = ="
-
-if [ -z ${DATABASE_NAME+x} ]; then
-  echo "(DATABASE_NAME is not set. Default will be used.)"
-  database=message_store
-  export DATABASE_NAME=$database
-else
-  database=$DATABASE_NAME
-fi
-echo
-
-if [ -z ${PGOPTIONS+x} ]; then
-  export PGOPTIONS='-c client_min_messages=warning'
-fi
-
-function delete-extensions {
-  echo "» pgcrypto extension"
-  psql $database -q -c "DROP EXTENSION IF EXISTS pgcrypto";
-}
-
-function delete-indexes {
-  echo "» messages_id_uniq_idx index"
-  psql $database -q -c "DROP INDEX IF EXISTS messages_id_uniq_idx CASCADE";
-
-  echo "» messages_stream_name_position_uniq_idx index"
-  psql $database -q -c "DROP INDEX IF EXISTS messages_stream_name_position_uniq_idx";
-
-  echo "» messages_category_global_position_idx index"
-  psql $database -q -c "DROP INDEX IF EXISTS messages_category_global_position_idx";
-}
-
-function delete-views {
-  echo "» stream_summary view"
-  psql $database -q -c "DROP VIEW IF EXISTS stream_summary CASCADE";
-
-  echo "» type_summary view"
-  psql $database -q -c "DROP VIEW IF EXISTS type_summary CASCADE";
-
-  echo "» stream_type_summary view"
-  psql $database -q -c "DROP VIEW IF EXISTS stream_type_summary CASCADE";
-
-  echo "» type_stream_summary view"
-  psql $database -q -c "DROP VIEW IF EXISTS type_stream_summary CASCADE";
-
-  echo "» category_type_summary view"
-  psql $database -q -c "DROP VIEW IF EXISTS category_type_summary CASCADE";
-
-  echo "» type_category_summary view"
-  psql $database -q -c "DROP VIEW IF EXISTS type_category_summary CASCADE";
-}
-
-function delete-functions {
-  echo "» hash_64 function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS hash_64 CASCADE";
-
-  echo "» category function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS category CASCADE";
-
-  echo "» stream_version function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS stream_version CASCADE";
-
-  echo "» write_message function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS write_message CASCADE";
-
-  echo "» get_stream_messages function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS get_stream_messages CASCADE";
-
-  echo "» get_category_messages function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS get_category_messages CASCADE";
-
-  echo "» get_last_message function"
-  psql $database -q -c "DROP FUNCTION IF EXISTS get_last_message CASCADE";
-}
-
-function delete-extensions {
-  echo "» pgcrypto extension"
-  psql $database -q -c "DROP EXTENSION IF EXISTS pgcrypto CASCADE";
-}
-
-function create-schema {
-  echo "» message_store schema"
-  psql $database -q -f $base/schema/message-store.sql
-}
-
-function add-table-to-schema {
-  echo "» messages table"
-  psql $database -q -c "ALTER TABLE messages SET SCHEMA message_store";
-}
-
-function create-extensions {
-  base=$(script_dir)
-
-  echo "» pgcrypto extension"
-  psql $database -q -f $base/extensions/pgcrypto.sql
-}
-
-function set-default-value {
-  echo "» id column"
-  psql $database -q -c "ALTER TABLE message_store.messages ALTER COLUMN id SET DEFAULT message_store.gen_random_uuid()";
-}
-
-echo "Deleting Views"
-echo "- - -"
-delete-views
-echo
-
-echo "Deleting Indexes"
-echo "- - -"
-delete-indexes
-echo
-
-echo "Deleting Functions"
-echo "- - -"
-delete-functions
-echo
-
-echo "Deleting Extensions"
-echo "- - -"
-delete-extensions
 echo
-
-echo "Creating Schema"
-echo "- - -"
-create-schema
+echo "WARNING: OBSOLETE"
 echo
-
-echo "Creating Extensions"
-echo "- - -"
-create-extensions
+echo "The ${BASH_SOURCE[0]} has been deprecated"
+echo "See the database/update directory for current update scripts"
 echo
 
-echo "Adding Table to Schema"
-echo "- - -"
-add-table-to-schema
-echo
-
-echo "Set Default Value for ID Column"
-echo "- - -"
-set-default-value
-echo
-
-# Install functions
-source $base/install-functions.sh
-
-# Install indexes
-source $base/install-indexes.sh
-
-# Install views
-source $base/install-views.sh
+current_directory="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+update_directory="$current_directory/update"
 
-# Install privileges
-source $base/install-privileges.sh
+echo "Contents of $update_directory"
+ls -1 $update_directory
 
-echo "= = ="
-echo "Done Updating Database"
-echo "Version: $(cat $base/VERSION.txt)"
 echo

data/database/update/1.0.0.sh

@@ -0,0 +1,184 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo
+echo "Message DB"
+echo
+echo "Update the message_store database"
+echo
+echo "WARNING:"
+echo "This script updates a pre-v1 message_store database to Message DB v1.x"
+echo "Do not run this script on a Message DB v1 database"
+echo
+echo "- Press CTRL+C to stop this script from running"
+echo "- Press RETURN to allow the script to proceed"
+echo
+read
+
+function script_dir {
+  val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+  echo "$val"
+}
+
+base="$(script_dir)/.."
+echo $base
+
+echo
+echo "Updating Database"
+echo "Version: $(cat $base/VERSION.txt)"
+echo "= = ="
+
+if [ -z ${DATABASE_NAME+x} ]; then
+  echo "(DATABASE_NAME is not set. Default will be used.)"
+  database=message_store
+  export DATABASE_NAME=$database
+else
+  database=$DATABASE_NAME
+fi
+echo
+
+if [ -z ${PGOPTIONS+x} ]; then
+  export PGOPTIONS='-c client_min_messages=warning'
+fi
+
+function delete-extensions {
+  echo "» pgcrypto extension"
+  psql $database -q -c "DROP EXTENSION IF EXISTS pgcrypto";
+}
+
+function delete-indexes {
+  echo "» messages_id_uniq_idx index"
+  psql $database -q -c "DROP INDEX IF EXISTS messages_id_uniq_idx CASCADE";
+
+  echo "» messages_stream_name_position_uniq_idx index"
+  psql $database -q -c "DROP INDEX IF EXISTS messages_stream_name_position_uniq_idx";
+
+  echo "» messages_category_global_position_idx index"
+  psql $database -q -c "DROP INDEX IF EXISTS messages_category_global_position_idx";
+}
+
+function delete-views {
+  echo "» stream_summary view"
+  psql $database -q -c "DROP VIEW IF EXISTS stream_summary CASCADE";
+
+  echo "» type_summary view"
+  psql $database -q -c "DROP VIEW IF EXISTS type_summary CASCADE";
+
+  echo "» stream_type_summary view"
+  psql $database -q -c "DROP VIEW IF EXISTS stream_type_summary CASCADE";
+
+  echo "» type_stream_summary view"
+  psql $database -q -c "DROP VIEW IF EXISTS type_stream_summary CASCADE";
+
+  echo "» category_type_summary view"
+  psql $database -q -c "DROP VIEW IF EXISTS category_type_summary CASCADE";
+
+  echo "» type_category_summary view"
+  psql $database -q -c "DROP VIEW IF EXISTS type_category_summary CASCADE";
+}
+
+function delete-functions {
+  echo "» hash_64 function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS hash_64 CASCADE";
+
+  echo "» category function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS category CASCADE";
+
+  echo "» stream_version function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS stream_version CASCADE";
+
+  echo "» write_message function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS write_message CASCADE";
+
+  echo "» get_stream_messages function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS get_stream_messages CASCADE";
+
+  echo "» get_category_messages function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS get_category_messages CASCADE";
+
+  echo "» get_last_message function"
+  psql $database -q -c "DROP FUNCTION IF EXISTS get_last_message CASCADE";
+}
+
+function delete-extensions {
+  echo "» pgcrypto extension"
+  psql $database -q -c "DROP EXTENSION IF EXISTS pgcrypto CASCADE";
+}
+
+function create-schema {
+  echo "» message_store schema"
+  psql $database -q -f $base/schema/message-store.sql
+}
+
+function add-table-to-schema {
+  echo "» messages table"
+  psql $database -q -c "ALTER TABLE messages SET SCHEMA message_store";
+}
+
+function create-extensions {
+  echo "» pgcrypto extension"
+  psql $database -q -f $base/extensions/pgcrypto.sql
+}
+
+function set-default-value {
+  echo "» id column"
+  psql $database -q -c "ALTER TABLE message_store.messages ALTER COLUMN id SET DEFAULT gen_random_uuid()";
+}
+
+echo "Deleting Views"
+echo "- - -"
+delete-views
+echo
+
+echo "Deleting Indexes"
+echo "- - -"
+delete-indexes
+echo
+
+echo "Deleting Functions"
+echo "- - -"
+delete-functions
+echo
+
+echo "Deleting Extensions"
+echo "- - -"
+delete-extensions
+echo
+
+echo "Creating Schema"
+echo "- - -"
+create-schema
+echo
+
+echo "Creating Extensions"
+echo "- - -"
+create-extensions
+echo
+
+echo "Adding Table to Schema"
+echo "- - -"
+add-table-to-schema
+echo
+
+echo "Set Default Value for ID Column"
+echo "- - -"
+set-default-value
+echo
+
+# Install functions
+source $base/install-functions.sh
+
+# Install indexes
+source $base/install-indexes.sh
+
+# Install views
+source $base/install-views.sh
+
+# Install privileges
+source $base/install-privileges.sh
+
+echo "= = ="
+echo "Done Updating Database"
+echo "Version: $(cat $base/VERSION.txt)"
+echo

data/scripts/{mdb-open-database-scripts-dir → mdb-print-database-scripts-dir}

@@ -2,4 +2,4 @@
 
 root = File.expand_path '../database', __dir__
 
-system `open #{root}`
+puts root

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message-db
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: scripts
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2019-12-21 00:00:00.000000000 Z
 dependencies: []
 description: " "
 email: opensource@eventide-project.org
@@ -18,15 +18,14 @@ executables:
 - mdb-print-type-category-summary
 - mdb-install-views
 - mdb-delete-db
-- mdb-update-db
 - mdb-print-type-summary
 - mdb-print-stream-type-summary
 - mdb-install-privileges
 - mdb-recreate-db
 - mdb-print-messages
 - mdb-print-message-store-version
+- mdb-print-database-scripts-dir
 - mdb-print-type-stream-summary
-- mdb-open-database-scripts-dir
 - mdb-write-test-message
 - mdb-install-indexes
 - mdb-install-functions
@@ -70,6 +69,7 @@ files:
 - database/print-type-stream-summary.sh
 - database/print-type-summary.sh
 - database/privileges/functions.sql
+- database/privileges/schema.sql
 - database/privileges/sequence.sql
 - database/privileges/table.sql
 - database/privileges/views.sql
@@ -79,6 +79,7 @@ files:
 - database/types/message.sql
 - database/uninstall.sh
 - database/update.sh
+- database/update/1.0.0.sh
 - database/views/category-type-summary.sql
 - database/views/stream-summary.sql
 - database/views/stream-type-summary.sql
@@ -93,8 +94,8 @@ files:
 - scripts/mdb-install-indexes
 - scripts/mdb-install-privileges
 - scripts/mdb-install-views
-- scripts/mdb-open-database-scripts-dir
 - scripts/mdb-print-category-type-summary
+- scripts/mdb-print-database-scripts-dir
 - scripts/mdb-print-message-store-version
 - scripts/mdb-print-messages
 - scripts/mdb-print-stream-summary
@@ -103,7 +104,6 @@ files:
 - scripts/mdb-print-type-stream-summary
 - scripts/mdb-print-type-summary
 - scripts/mdb-recreate-db
-- scripts/mdb-update-db
 - scripts/mdb-write-test-message
 homepage: https://github.com/message-db/message-db
 licenses:

data/scripts/mdb-update-db

@@ -1,7 +0,0 @@
-#!/usr/bin/env ruby
-
-root = File.expand_path '../database', __dir__
-script_filename = 'update.sh'
-script_filepath = File.join root, script_filename
-
-system script_filepath