message-db 2.1.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff67bc3fb9b5d5c704d14440e8c44007d43b7c667d836a1d75d0525a20b2c681
-  data.tar.gz: ff913d2ba8a54b89fe247e9cf9afd0e3d354a50ed185a14bf25b42eb278336e9
+  metadata.gz: 47624b22850abd2ee71b60e2b721c215dc20e2ca6985b495ffe3d8013cf78a89
+  data.tar.gz: eea2b47d9026568e707383ec60dd9c0595f8f1723992a14743392ca3f19ddecf
 SHA512:
-  metadata.gz: ca04dfcd83b747e80e72f9d8bc46ad580b1ec4f9f0fe2077da872381d93fda23cea54b6c91f66b10ff5b035c3e9b1333bbc2b448a837e9142f90bb05d8c760f7
-  data.tar.gz: d683719cfb71ca7552534b4a1874094e3c685bccc6bf73e025aa401580b66969415181f523bb28ef3d567be73aabe3ad7ef2021fbf12739a55686bf7a8ca0734
+  metadata.gz: 6acf0100e509408dcf6934031b0e1308e405cfb3319fab40d5149ce2a6910763fdb9e8a16359d4141adc50d030d17d6036ce125e42adae94f5610fd2bac9eccd
+  data.tar.gz: 995ea8891da3435e9c818c17120e2d0c9e0807382193c1b0be7d7a2b4d15e9f1770b28c67aced4195a6b0294105c89fbc43e82cecef8b70695669e1c3694f724

data/database/VERSION.txt

@@ -1 +1 @@
-1.2.6
+1.3.0

data/database/benchmark.sh

@@ -35,18 +35,22 @@ fi
 echo "Database name is: $database"
 echo
 
+function run_psql {
+  psql $database -v ON_ERROR_STOP=1 "$@"
+}
+
 echo "Installing benchmark scripts"
 echo
 
-psql $database -q -f $base/benchmark_write.sql
-psql $database -q -f $base/benchmark_get.sql
+run_psql -q -f $base/benchmark_write.sql
+run_psql -q -f $base/benchmark_get.sql
 
 echo
 echo "Benchmarking write"
 echo "- - -"
 echo
 
-psql $database -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_write('$stream_name'::varchar, $cycles::int);"
+run_psql -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_write('$stream_name'::varchar, $cycles::int);"
 
 echo
 
@@ -55,7 +59,7 @@ echo "Benchmarking get"
 echo "- - -"
 echo
 
-psql $database -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_get('$stream_name'::varchar, $cycles::int);"
+run_psql -U message_store -c "EXPLAIN ANALYZE SELECT benchmark_get('$stream_name'::varchar, $cycles::int);"
 
 echo "= = ="
 echo "Done"

data/database/benchmark_get.sql

@@ -19,6 +19,3 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql
 VOLATILE;
-
-
-

data/database/benchmark_write.sql

@@ -19,6 +19,3 @@ BEGIN
 END;
 $$ LANGUAGE plpgsql
 VOLATILE;
-
-
-

data/database/clear-messages.sh

@@ -19,7 +19,7 @@ echo "Database name is: $database"
 
 echo
 
-psql $database -q -c "TRUNCATE message_store.messages RESTART IDENTITY;"
+psql $database -v ON_ERROR_STOP=1 -q -c "TRUNCATE message_store.messages RESTART IDENTITY;"
 
 echo "= = ="
 echo "Done Clearing Messages Table"

data/database/functions/get-last-stream-message.sql

@@ -1,5 +1,6 @@
 CREATE OR REPLACE FUNCTION message_store.get_last_stream_message(
-  stream_name varchar
+  stream_name varchar,
+  type varchar DEFAULT NULL
 )
 RETURNS SETOF message_store.message
 AS $$
@@ -19,7 +20,14 @@ BEGIN
     FROM
       messages
     WHERE
-      stream_name = $1
+      stream_name = $1';
+
+  IF get_last_stream_message.type IS NOT NULL THEN
+    _command := _command || ' AND
+      type = $2';
+  END IF;
+
+  _command := _command || '
     ORDER BY
       position DESC
     LIMIT
@@ -28,10 +36,13 @@ BEGIN
   IF current_setting('message_store.debug_get', true) = 'on' OR current_setting('message_store.debug', true) = 'on' THEN
     RAISE NOTICE '» get_last_message';
     RAISE NOTICE 'stream_name ($1): %', get_last_stream_message.stream_name;
+    RAISE NOTICE 'type ($2): %', get_last_stream_message.type;
     RAISE NOTICE 'Generated Command: %', _command;
   END IF;
 
-  RETURN QUERY EXECUTE _command USING get_last_stream_message.stream_name;
+  RETURN QUERY EXECUTE _command USING
+    get_last_stream_message.stream_name,
+    get_last_stream_message.type;
 END;
 $$ LANGUAGE plpgsql
 VOLATILE;

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.2.6';
+  RETURN '1.3.0';
 END;
 $$ LANGUAGE plpgsql
 VOLATILE;

data/database/install-functions.sh

@@ -2,70 +2,67 @@
 
 set -e
 
+if [ -z ${DATABASE_NAME+x} ]; then
+  database=message_store
+  echo "(DATABASE_NAME is not set. Using: $database.)"
+else
+  database=$DATABASE_NAME
+fi
+
+function run_psql_file {
+  psql $database -q -v ON_ERROR_STOP=1 -f "$1"
+}
+
 function script_dir {
   val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   echo "$val"
 }
 
 function create-types {
-  if [ -z ${DATABASE_NAME+x} ]; then
-    database=message_store
-    echo "(DATABASE_NAME is not set. Using: $database.)"
-  else
-    database=$DATABASE_NAME
-  fi
-
   base=$(script_dir)
 
   echo "» message type"
-  psql $database -q -f $base/types/message.sql
+  run_psql_file $base/types/message.sql
 }
 
 function create-functions {
-  if [ -z ${DATABASE_NAME+x} ]; then
-    database=message_store
-    echo "(DATABASE_NAME is not set. Using: $database.)"
-  else
-    database=$DATABASE_NAME
-  fi
-
   base=$(script_dir)
 
   echo "» message_store_version function"
-  psql $database -q -f $base/functions/message-store-version.sql
+  run_psql_file $base/functions/message-store-version.sql
 
   echo "» hash_64 function"
-  psql $database -q -f $base/functions/hash-64.sql
+  run_psql_file $base/functions/hash-64.sql
 
   echo "» acquire_lock function"
-  psql $database -q -f $base/functions/acquire-lock.sql
+  run_psql_file $base/functions/acquire-lock.sql
 
   echo "» category function"
-  psql $database -q -f $base/functions/category.sql
+  run_psql_file $base/functions/category.sql
 
   echo "» is_category function"
-  psql $database -q -f $base/functions/is-category.sql
+  run_psql_file $base/functions/is-category.sql
 
   echo "» id function"
-  psql $database -q -f $base/functions/id.sql
+  run_psql_file $base/functions/id.sql
 
   echo "» cardinal_id function"
-  psql $database -q -f $base/functions/cardinal-id.sql
+  run_psql_file $base/functions/cardinal-id.sql
 
   echo "» stream_version function"
-  psql $database -q -f $base/functions/stream-version.sql
+  run_psql_file $base/functions/stream-version.sql
 
   echo "» write_message function"
-  psql $database -q -f $base/functions/write-message.sql
+  run_psql_file $base/functions/write-message.sql
 
   echo "» get_stream_messages function"
-  psql $database -q -f $base/functions/get-stream-messages.sql
+  run_psql_file $base/functions/get-stream-messages.sql
 
   echo "» get_category_messages function"
-  psql $database -q -f $base/functions/get-category-messages.sql
+  run_psql_file $base/functions/get-category-messages.sql
 
   echo "» get_last_stream_message function"
-  psql $database -q -f $base/functions/get-last-stream-message.sql
+  run_psql_file $base/functions/get-last-stream-message.sql
 }
 
 echo "Creating Types"

data/database/install-indexes.sh

@@ -2,29 +2,33 @@
 
 set -e
 
+if [ -z ${DATABASE_NAME+x} ]; then
+  database=message_store
+  echo "(DATABASE_NAME is not set. Using: $database.)"
+else
+  database=$DATABASE_NAME
+fi
+
+function run_psql_file {
+  psql $database -q -v ON_ERROR_STOP=1 -f "$1"
+}
+
 function script_dir {
   val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   echo "$val"
 }
 
 function create-indexes {
-  if [ -z ${DATABASE_NAME+x} ]; then
-    database=message_store
-    echo "(DATABASE_NAME is not set. Using: $database.)"
-  else
-    database=$DATABASE_NAME
-  fi
-
   base=$(script_dir)
 
   echo "» messages_id index"
-  psql $database -q -f $base/indexes/messages-id.sql
+  run_psql_file $base/indexes/messages-id.sql
 
   echo "» messages_stream index"
-  psql $database -q -f $base/indexes/messages-stream.sql
+  run_psql_file $base/indexes/messages-stream.sql
 
   echo "» messages_category index"
-  psql $database -q -f $base/indexes/messages-category.sql
+  run_psql_file $base/indexes/messages-category.sql
 }
 
 echo "Creating Indexes"

data/database/install-privileges.sh

@@ -2,35 +2,39 @@
 
 set -e
 
+if [ -z ${DATABASE_NAME+x} ]; then
+  database=message_store
+  echo "(DATABASE_NAME is not set. Using: $database.)"
+else
+  database=$DATABASE_NAME
+fi
+
+function run_psql_file {
+  psql $database -q -v ON_ERROR_STOP=1 -f "$1"
+}
+
 function script_dir {
   val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   echo "$val"
 }
 
 function grant-privileges {
-  if [ -z ${DATABASE_NAME+x} ]; then
-    database=message_store
-    echo "(DATABASE_NAME is not set. Using: $database.)"
-  else
-    database=$DATABASE_NAME
-  fi
-
   base=$(script_dir)
 
   echo "» schema privileges"
-  psql $database -q -f $base/privileges/schema.sql
+  run_psql_file $base/privileges/schema.sql
 
   echo "» messages table privileges"
-  psql $database -q -f $base/privileges/table.sql
+  run_psql_file $base/privileges/table.sql
 
   echo "» sequence privileges"
-  psql $database -q -f $base/privileges/sequence.sql
+  run_psql_file $base/privileges/sequence.sql
 
   echo "» functions privileges"
-  psql $database -q -f $base/privileges/functions.sql
+  run_psql_file $base/privileges/functions.sql
 
   echo "» views privileges"
-  psql $database -q -f $base/privileges/views.sql
+  run_psql_file $base/privileges/views.sql
 }
 
 echo "Granting Privileges"

data/database/install-views.sh

@@ -2,38 +2,42 @@
 
 set -e
 
+if [ -z ${DATABASE_NAME+x} ]; then
+  database=message_store
+  echo "(DATABASE_NAME is not set. Using: $database.)"
+else
+  database=$DATABASE_NAME
+fi
+
+function run_psql_file {
+  psql $database -q -v ON_ERROR_STOP=1 -f "$1"
+}
+
 function script_dir {
   val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   echo "$val"
 }
 
 function create-views {
-  if [ -z ${DATABASE_NAME+x} ]; then
-    database=message_store
-    echo "(DATABASE_NAME is not set. Using: $database.)"
-  else
-    database=$DATABASE_NAME
-  fi
-
   base=$(script_dir)
 
   echo "» stream_summary view"
-  psql $database -q -f $base/views/stream-summary.sql
+  run_psql_file $base/views/stream-summary.sql
 
   echo "» type_summary view"
-  psql $database -q -f $base/views/type-summary.sql
+  run_psql_file $base/views/type-summary.sql
 
   echo "» stream_type_summary view"
-  psql $database -q -f $base/views/stream-type-summary.sql
+  run_psql_file $base/views/stream-type-summary.sql
 
   echo "» type_stream_summary view"
-  psql $database -q -f $base/views/type-stream-summary.sql
+  run_psql_file $base/views/type-stream-summary.sql
 
   echo "» category_type_summary view"
-  psql $database -q -f $base/views/category-type-summary.sql
+  run_psql_file $base/views/category-type-summary.sql
 
   echo "» type_category_summary view"
-  psql $database -q -f $base/views/type-category-summary.sql
+  run_psql_file $base/views/type-category-summary.sql
 }
 
 echo "Creating Views"

data/database/install.sh

@@ -2,6 +2,10 @@
 
 set -e
 
+function run_psql {
+  psql -q -v ON_ERROR_STOP=1 "$@"
+}
+
 function script_dir {
   val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   echo "$val"
@@ -41,7 +45,7 @@ function create-user {
   base=$(script_dir)
 
   echo "» message_store role"
-  psql postgres -q -f $base/roles/message-store.sql
+  run_psql postgres -f $base/roles/message-store.sql
 }
 
 function create-database {
@@ -51,21 +55,21 @@ function create-database {
 
 function create-schema {
   echo "» message_store schema"
-  psql $database -q -f $base/schema/message-store.sql
+  run_psql $database -f $base/schema/message-store.sql
 }
 
 function create-extensions {
   base=$(script_dir)
 
   echo "» pgcrypto extension"
-  psql $database -q -f $base/extensions/pgcrypto.sql
+  run_psql $database -f $base/extensions/pgcrypto.sql
 }
 
 function create-table {
   base=$(script_dir)
 
   echo "» messages table"
-  psql $database -q -f $base/tables/messages.sql
+  run_psql $database -f $base/tables/messages.sql
 }
 
 echo

data/database/print-category-type-summary.sh

@@ -30,15 +30,19 @@ else
   echo "Category is: $CATEGORY"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "$1"
+}
+
 echo
 echo "Category Type Summary"
 echo "= = ="
 echo
 
 if [ -z $category ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM category_type_summary;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
+  run_psql_command "SELECT * FROM category_type_summary;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT * FROM category_type_summary WHERE category LIKE '%$category%';"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE category(stream_name) LIKE '%$category%';"
+  run_psql_command "SELECT * FROM category_type_summary WHERE category LIKE '%$category%';"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages WHERE category(stream_name) LIKE '%$category%';"
 fi

data/database/print-message-store-version.sh

@@ -29,4 +29,4 @@ default_table_name=messages
 
 echo
 
-psql $database -U $user -P pager=off -c "SELECT message_store_version();"
+psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "SELECT message_store_version();"

data/database/print-messages.sh

@@ -35,10 +35,14 @@ else
   echo "Stream name is: $STREAM_NAME"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -x -c "$1"
+}
+
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -U $user -x -P pager=off -c "SELECT * FROM messages ORDER BY global_position ASC"
+  run_psql_command "SELECT * FROM messages ORDER BY global_position ASC"
 else
-  psql $database -U $user -x -P pager=off -c "SELECT * FROM messages WHERE stream_name = '$stream_name' ORDER BY global_position ASC"
+  run_psql_command "SELECT * FROM messages WHERE stream_name = '$stream_name' ORDER BY global_position ASC"
 fi

data/database/print-stream-summary.sh

@@ -30,15 +30,19 @@ else
   echo "Stream name is: $STREAM_NAME"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "$1"
+}
+
 echo
 echo "Stream Summary"
 echo "= = ="
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM stream_summary ORDER BY message_count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
+  run_psql_command "SELECT * FROM stream_summary ORDER BY message_count DESC;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT * FROM stream_summary WHERE stream_name LIKE '%$stream_name%' ORDER BY message_count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE stream_name LIKE '%$stream_name%';"
+  run_psql_command "SELECT * FROM stream_summary WHERE stream_name LIKE '%$stream_name%' ORDER BY message_count DESC;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages WHERE stream_name LIKE '%$stream_name%';"
 fi

data/database/print-stream-type-summary.sh

@@ -30,15 +30,19 @@ else
   echo "Stream name is: $STREAM_NAME"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "$1"
+}
+
 echo
 echo "Stream Type Summary"
 echo "= = ="
 echo
 
 if [ -z $stream_name ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM stream_type_summary ORDER BY stream_name, message_count DESC, type;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
+  run_psql_command "SELECT * FROM stream_type_summary ORDER BY stream_name, message_count DESC, type;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT * FROM stream_type_summary WHERE stream_name LIKE '%$stream_name%' ORDER BY stream_name, message_count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE stream_name LIKE '%$stream_name%';"
+  run_psql_command "SELECT * FROM stream_type_summary WHERE stream_name LIKE '%$stream_name%' ORDER BY stream_name, message_count DESC;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages WHERE stream_name LIKE '%$stream_name%';"
 fi

data/database/print-type-category-summary.sh

@@ -30,15 +30,19 @@ else
   echo "Type is: $TYPE"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "$1"
+}
+
 echo
 echo "Type Category Summary"
 echo "= = ="
 echo
 
 if [ -z $type ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM type_category_summary;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
+  run_psql_command "SELECT * FROM type_category_summary;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT * FROM type_category_summary WHERE type LIKE '%$type%';"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
+  run_psql_command "SELECT * FROM type_category_summary WHERE type LIKE '%$type%';"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
 fi

data/database/print-type-stream-summary.sh

@@ -30,15 +30,19 @@ else
   echo "Type is: $TYPE"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "$1"
+}
+
 echo
 echo "Type Stream Summary"
 echo "= = ="
 echo
 
 if [ -z $type ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM type_stream_summary ORDER BY type, message_count DESC, stream_name;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
+  run_psql_command "SELECT * FROM type_stream_summary ORDER BY type, message_count DESC, stream_name;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT * FROM type_stream_summary WHERE type LIKE '%$type%' ORDER BY type, message_count DESC, stream_name;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
+  run_psql_command "SELECT * FROM type_stream_summary WHERE type LIKE '%$type%' ORDER BY type, message_count DESC, stream_name;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
 fi

data/database/print-type-summary.sh

@@ -30,15 +30,19 @@ else
   echo "Type is: $TYPE"
 fi
 
+function run_psql_command {
+  psql $database -v ON_ERROR_STOP=1 -U $user -P pager=off -c "$1"
+}
+
 echo
 echo "Type Summary"
 echo "= = ="
 echo
 
 if [ -z $type ]; then
-  psql $database -U $user -P pager=off -c "SELECT * FROM type_summary ORDER BY message_count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages;"
+  run_psql_command "SELECT * FROM type_summary ORDER BY message_count DESC;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages;"
 else
-  psql $database -U $user -P pager=off -c "SELECT * FROM type_summary WHERE type LIKE '%$type%' ORDER BY message_count DESC;"
-  psql $database -U $user -P pager=off -c "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
+  run_psql_command "SELECT * FROM type_summary WHERE type LIKE '%$type%' ORDER BY message_count DESC;"
+  run_psql_command "SELECT COUNT(*) AS total_count FROM messages WHERE type LIKE '%$type%';"
 fi

data/database/privileges/functions.sql

@@ -4,7 +4,7 @@ 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.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_last_stream_message(varchar, 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;

data/database/uninstall.sh

@@ -2,6 +2,10 @@
 
 set -e
 
+function run_psql_command {
+  psql -q -v ON_ERROR_STOP=1 -P pager=off postgres -c "$1"
+}
+
 function script_dir {
   val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
   echo "$val"
@@ -28,12 +32,12 @@ fi
 
 function delete-user {
   echo "» message_store user"
-  psql postgres -P pager=off -q -c "DROP ROLE IF EXISTS message_store;"
+  run_psql_command "DROP ROLE IF EXISTS message_store;"
 }
 
 function delete-database {
   echo "» $database database"
-  psql postgres -P pager=off -q -c "DROP DATABASE IF EXISTS \"$database\";"
+  run_psql_command "DROP DATABASE IF EXISTS \"$database\";"
 }
 
 echo "Deleting database"

data/database/update/1.3.0.md

@@ -0,0 +1,13 @@
+# 1.3.0 Update
+
+Note: There are no backward-incompatible changes in this update.
+
+For more information about Message DB update scripts, see:
+
+[http://docs.eventide-project.org/user-guide/message-db/update.html](http://docs.eventide-project.org/user-guide/message-db/update.html)
+
+The following changes are made by the v1.3.0 update script:
+
+- The `get_last_stream_message` function is replaced with an implementation that receives the additional `type` argument that constrains the result to the last message of a stream of a specified message type (see: [http://docs.eventide-project.org/user-guide/message-db/server-functions.html#get-last-message-from-a-stream](http://docs.eventide-project.org/user-guide/message-db/server-functions.html#get-last-message-from-a-stream))
+- Grants the execution privilege for the new `get_last_stream_message` function implementation to the `message_store` role
+- The database installation scripts terminate on error, rather than proceeding with the rest of the installation when a script error occurs, as was the case with previous versions

data/database/update/1.3.0.sh

@@ -0,0 +1,95 @@
+#!/usr/bin/env bash
+
+set -e
+
+echo
+echo "Message DB"
+echo
+echo "Update the message_store database to v1.3.0"
+echo
+echo "Fore more information about the changes made to the message store by"
+echo "this update, see: https://github.com/message-db/message-db/blob/master/database/update/1.3.0.md"
+echo
+echo "- Press CTRL+C to cancel"
+echo "- Press RETURN to proceed with the update"
+echo
+
+read
+
+function run_psql {
+  psql $database -q -v ON_ERROR_STOP=1 -c "$@"
+}
+
+function run_psql_file {
+  psql $database -q -v ON_ERROR_STOP=1 -f "$1"
+}
+
+function script_dir {
+  val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+  echo "$val"
+}
+
+base="$(script_dir)/.."
+echo $base
+
+echo
+echo "Updating Database"
+echo "Version: 1.3.0"
+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-functions {
+  echo "» get_last_message function"
+  run_psql "DROP FUNCTION IF EXISTS message_store.get_last_stream_message(varchar) CASCADE";
+
+  echo "» message_store_version function"
+  run_psql "DROP FUNCTION IF EXISTS message_store.message_store_version CASCADE";
+}
+
+function install-functions {
+  echo "» get_last_stream_message function"
+  run_psql_file $base/functions/get-last-stream-message.sql
+
+  echo "» message_store_version function"
+  run_psql_file $base/functions/message-store-version.sql
+}
+
+function grant-privileges {
+  echo "» get_last_stream_message function privilege"
+  run_psql "GRANT EXECUTE ON FUNCTION message_store.get_last_stream_message(varchar, varchar) TO message_store;"
+
+  echo "» message_store_version function"
+  run_psql "GRANT EXECUTE ON FUNCTION message_store.message_store_version TO message_store;"
+}
+
+echo "Deleting Functions"
+echo "- - -"
+delete-functions
+echo
+
+echo "Installing Functions"
+echo "- - -"
+install-functions
+echo
+
+echo "Granting Privileges to the Function"
+echo "- - -"
+grant-privileges
+echo
+
+echo "= = ="
+echo "Done Updating Database"
+echo "Version: 1.3.0"
+echo

data/database/write-test-message.sh

@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
-set -u
+set -ue
+
+function run_psql {
+  psql -v ON_ERROR_STOP=1 "$@"
+}
 
 instances=1
 if [ ! -z ${INSTANCES+x} ]; then
@@ -13,6 +17,11 @@ if [ ! -z ${STREAM_NAME+x} ]; then
   stream_name=$STREAM_NAME
 fi
 
+type="SomeType"
+if [ ! -z ${TYPE+x} ]; then
+  type=$TYPE
+fi
+
 title="Writing $instances Messages to Stream $stream_name"
 if [ -z ${METADATA+x} ]; then
   metadata="'{\"metaAttribute\": \"some meta value\"}'"
@@ -53,11 +62,11 @@ for (( i=1; i<=instances; i++ )); do
 
   echo "Instance: $i, Message ID: $uuid"
 
-  psql $database -U $user -c "SELECT write_message('$uuid'::varchar, '$stream_name'::varchar, 'SomeType'::varchar, '{\"attribute\": \"some value\"}'::jsonb, $metadata);" > /dev/null
+  run_psql $database -U $user -c "SELECT write_message('$uuid'::varchar, '$stream_name'::varchar, '$type'::varchar, '{\"attribute\": \"some value\"}'::jsonb, $metadata);" > /dev/null
 done
 
 
 echo
-psql $database -U $user -P pager=off -x -c "SELECT * FROM messages WHERE stream_name = '$stream_name';"
+run_psql $database -U $user -P pager=off -x -c "SELECT * FROM messages WHERE stream_name = '$stream_name';"
 
 echo

metadata

@@ -1,36 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: message-db
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 3.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: scripts
 cert_chain: []
-date: 2021-03-14 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies: []
 description: " "
 email: opensource@eventide-project.org
 executables:
-- mdb-print-stream-summary
+- mdb-clear-messages
 - mdb-create-db
-- mdb-print-type-category-summary
-- mdb-install-views
 - mdb-delete-db
-- mdb-print-type-summary
-- mdb-print-stream-type-summary
+- mdb-install-functions
+- mdb-install-indexes
 - mdb-install-privileges
-- mdb-recreate-db
-- mdb-print-messages
-- mdb-print-message-store-version
+- mdb-install-views
+- mdb-print-category-type-summary
 - mdb-print-database-scripts-dir
+- mdb-print-message-store-version
+- mdb-print-messages
+- mdb-print-stream-summary
+- mdb-print-stream-type-summary
+- mdb-print-type-category-summary
 - mdb-print-type-stream-summary
+- mdb-print-type-summary
+- mdb-recreate-db
 - mdb-write-test-message
-- mdb-install-indexes
-- mdb-install-functions
-- mdb-clear-messages
-- mdb-print-category-type-summary
 extensions: []
 extra_rdoc_files: []
 files:
@@ -83,6 +83,8 @@ files:
 - database/update/1.0.0.sh
 - database/update/1.2.2.md
 - database/update/1.2.2.sh
+- database/update/1.3.0.md
+- database/update/1.3.0.sh
 - database/views/category-type-summary.sql
 - database/views/stream-summary.sql
 - database/views/stream-type-summary.sql
@@ -127,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Microservice native event store and message store for Postgres