evt-message_store-postgres-database 0.9.0.1 → 0.10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 544236fd8913ca01aca2a8fe933af45b7ff7000c368072c2df0d385c4eb40c82
-  data.tar.gz: 18c0a4f6906247ae4357c22a05844ceaf447fd03c4b0d410c6b1a095c9f76c4e
+  metadata.gz: d9ee310a4aacf67ad9d3a97bde6dcf969b39afdc32c578004797894f91716fcf
+  data.tar.gz: d5afd1eba683a6862097a165dc8e5129635a817e05238318b6b1f98ea3074a38
 SHA512:
-  metadata.gz: 44d4e64e6c5bc7f132b845525ef75b4c13a216f1db654788fbaaed6e222665f7d09868785a1ff74537ee1c3e7d735fdd98067620209c347bb22db84fb8067ab6
-  data.tar.gz: c3f284cc83cd66b8d86a8d59d31465f8e7db51e403c9962dec2e84ab5e49ad657c26ddd15f908516038071262e545192fd91c9e2ad0029be0510c7e3619fe331
+  metadata.gz: 7d5075bcea7470bb1d8dc320e83a39d79163e93e40bba7bc9dd0881a51e536dc16442beec4be75fe070c0417d8762a661833a1adaefbbc6f0df25c6b5d3fe0d3
+  data.tar.gz: 26180f49acedaad535d836294e8d18e006838efdb4740c146e154efffe5f267d5a4363af05f2046f8a6cd39b31899fdac28c02a0707c77060e77b3fe630e726f

data/database/install-privileges.sh

@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+
+set -e
+
+default_name=message_store
+
+if [ -z ${DATABASE_NAME+x} ]; then
+  echo "(DATABASE_NAME is not set. Default will be used.)"
+  database=$default_name
+else
+  database=$DATABASE_NAME
+fi
+echo "Database name is: $database"
+
+function script_dir {
+  val="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+  echo "$val"
+}
+
+function grant-privileges {
+  base=$(script_dir)
+  psql $database -f $base/user/privileges.sql
+  echo
+}
+
+echo
+echo "Granting Privileges"
+echo "- - -"
+grant-privileges

data/database/install.sh

@@ -8,15 +8,6 @@ echo "= = ="
 echo
 
 default_name=message_store
-
-if [ -z ${DATABASE_USER+x} ]; then
-  echo "(DATABASE_USER is not set. Default will be used.)"
-  user=$default_name
-else
-  user=$DATABASE_USER
-fi
-echo "Database user is: $user"
-
 if [ -z ${DATABASE_NAME+x} ]; then
   echo "(DATABASE_NAME is not set. Default will be used.)"
   database=$default_name
@@ -33,7 +24,8 @@ function script_dir {
 }
 
 function create-user {
-  createuser -s $user
+  base=$(script_dir)
+  psql -f $base/user/role.sql
   echo
 }
 
@@ -44,19 +36,20 @@ function create-database {
 
 function create-extensions {
   base=$(script_dir)
-  psql $database -f $base/extensions.sql
+  psql $database -f $base/extension/pgcrypto.sql
   echo
 }
 
 function create-table {
-  psql $database -f $base/table/messages-table.sql
+  base=$(script_dir)
+  psql $database -f $base/table/messages.sql
   echo
 }
 
 base=$(script_dir)
 
 echo
-echo "Creating User: $user"
+echo "Creating User: message_store"
 echo "- - -"
 create-user
 
@@ -83,3 +76,8 @@ source $base/install-indexes.sh
 
 # Install views
 source $base/install-views.sh
+
+echo
+echo "Granting Privileges"
+echo "- - -"
+source $base/install-privileges.sh

data/database/table/{messages-table.sql → messages.sql}

@@ -1,7 +1,7 @@
 -- ----------------------------
 --  Table structure for messages
 -- ----------------------------
-CREATE TABLE "public"."messages" (
+CREATE TABLE IF NOT EXISTS "public"."messages" (
   "id" UUID NOT NULL DEFAULT gen_random_uuid(),
   "stream_name" varchar(255) NOT NULL COLLATE "default",
   "type" varchar(255) NOT NULL COLLATE "default",

data/database/types/message.sql

@@ -1,8 +1,6 @@
 DO $$
 BEGIN
-  IF EXISTS (SELECT 1 FROM pg_type WHERE typname = 'message') THEN
-    DROP TYPE message CASCADE;
-  END IF;
+  DROP TYPE IF EXISTS message CASCADE;
 
   CREATE TYPE message AS (
     id varchar,

data/database/uninstall.sh

@@ -26,32 +26,48 @@ fi
 echo "Database name is: $database"
 echo
 
-function delete-user {
-  user_exists=`psql postgres -qtAXc "SELECT 1 FROM pg_roles WHERE rolname='$user'"`
+# function delete-user {
+#   user_exists=`psql postgres -qtAXc "SELECT 1 FROM pg_roles WHERE rolname='$user'"`
+
+#   if [ "$user_exists" = "1" ]; then
+#     echo "Deleting database user \"$user\"..."
+#     dropuser $user
+#   else
+#     echo "Database user \"$user\" does not exist. Not deleting."
+#   fi
 
-  if [ "$user_exists" = "1" ]; then
-    echo "Deleting database user \"$user\"..."
-    dropuser $user
-  else
-    echo "Database user \"$user\" does not exist. Not deleting."
-  fi
+#   echo
+# }
 
+function delete-user {
+  psql -P pager=off -c "DROP ROLE IF EXISTS $user;"
   echo
 }
 
-function delete-database {
-  database_exists=`psql postgres -qtAXc "SELECT 1 FROM pg_database WHERE datname='$database'"`
+# function delete-database {
+#   database_exists=`psql postgres -qtAXc "SELECT 1 FROM pg_database WHERE datname='$database'"`
+
+#   if [ "$database_exists" = "1" ]; then
+#     echo "Deleting database \"$database\"..."
+#     dropdb $database
+#   else
+#     echo "Database \"$database\" does not exist. Not deleting."
+#   fi
 
-  if [ "$database_exists" = "1" ]; then
-    echo "Deleting database \"$database\"..."
-    dropdb $database
-  else
-    echo "Database \"$database\" does not exist. Not deleting."
-  fi
+#   echo
+# }
 
+function delete-database {
+  psql -P pager=off -c "DROP DATABASE IF EXISTS $database;"
   echo
 }
 
-
+echo
+echo "Deleting database \"$database\"..."
+echo "- - -"
 delete-database
+
+echo
+echo "Deleting database user \"$user\"..."
+echo "- - -"
 delete-user

data/database/user/privileges.sql

@@ -0,0 +1,24 @@
+-- Table
+GRANT SELECT, INSERT ON messages TO message_store;
+
+-- Sequence
+GRANT USAGE, SELECT ON SEQUENCE messages_global_position_seq TO message_store;
+
+-- Functions
+GRANT EXECUTE ON FUNCTION gen_random_uuid TO message_store;
+GRANT EXECUTE ON FUNCTION md5(text) TO message_store;
+GRANT EXECUTE ON FUNCTION hash_64 TO message_store;
+GRANT EXECUTE ON FUNCTION category TO message_store;
+GRANT EXECUTE ON FUNCTION stream_version TO message_store;
+GRANT EXECUTE ON FUNCTION write_message TO message_store;
+GRANT EXECUTE ON FUNCTION get_stream_messages TO message_store;
+GRANT EXECUTE ON FUNCTION get_category_messages TO message_store;
+GRANT EXECUTE ON FUNCTION get_last_message TO message_store;
+
+-- Views
+GRANT SELECT, INSERT ON category_type_summary TO message_store;
+GRANT SELECT, INSERT ON stream_summary TO message_store;
+GRANT SELECT, INSERT ON stream_type_summary TO message_store;
+GRANT SELECT, INSERT ON type_category_summary TO message_store;
+GRANT SELECT, INSERT ON type_stream_summary TO message_store;
+GRANT SELECT, INSERT ON type_summary TO message_store;

data/database/user/role.sql

@@ -0,0 +1,7 @@
+DO $$
+BEGIN
+  CREATE ROLE message_store WITH LOGIN;
+EXCEPTION
+  WHEN duplicate_object THEN
+      RAISE NOTICE 'The message_store role already exists';
+END$$;

data/scripts/evt-pg-install-indexes

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

data/scripts/evt-pg-install-privileges

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store-postgres-database
 version: !ruby/object:Gem::Version
-  version: 0.9.0.1
+  version: 0.10.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: scripts
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies: []
 description: " "
 email: opensource@eventide-project.org
@@ -19,6 +19,7 @@ executables:
 - evt-pg-update-db
 - evt-pg-delete-db
 - evt-pg-print-stream-type-summary
+- evt-pg-install-indexes
 - evt-pg-write-test-message
 - evt-pg-create-db
 - evt-pg-print-type-category-summary
@@ -29,6 +30,7 @@ executables:
 - evt-pg-print-type-stream-summary
 - evt-pg-print-type-summary
 - evt-pg-print-stream-summary
+- evt-pg-install-privileges
 extensions: []
 extra_rdoc_files: []
 files:
@@ -36,13 +38,12 @@ files:
 - database/benchmark_get.sql
 - database/benchmark_write.sql
 - database/clear-messages.sh
-- database/extensions.sql
+- database/extension/pgcrypto.sql
 - database/functions/category.sql
 - database/functions/get-category-messages.sql
 - database/functions/get-last-message.sql
 - database/functions/get-stream-messages.sql
 - database/functions/hash-64.sql
-- database/functions/scratch.sql
 - database/functions/stream-version.sql
 - database/functions/write-message.sql
 - database/indexes/messages-category-global-position.sql
@@ -50,6 +51,7 @@ files:
 - database/indexes/messages-stream-name-position-uniq.sql
 - database/install-functions.sh
 - database/install-indexes.sh
+- database/install-privileges.sh
 - database/install-views.sh
 - database/install.sh
 - database/print-category-type-summary.sh
@@ -60,10 +62,12 @@ files:
 - database/print-type-stream-summary.sh
 - database/print-type-summary.sh
 - database/rename-updated-to-recorded.sh
-- database/table/messages-table.sql
+- database/table/messages.sql
 - database/types/message.sql
 - database/uninstall.sh
 - database/update.sh
+- database/user/privileges.sql
+- database/user/role.sql
 - database/views/category-type-summary.sql
 - database/views/stream-summary.sql
 - database/views/stream-type-summary.sql
@@ -75,6 +79,8 @@ files:
 - scripts/evt-pg-create-db
 - scripts/evt-pg-delete-db
 - scripts/evt-pg-install-functions
+- scripts/evt-pg-install-indexes
+- scripts/evt-pg-install-privileges
 - scripts/evt-pg-install-views
 - scripts/evt-pg-open-database-scripts-dir
 - scripts/evt-pg-print-category-type-summary

data/database/functions/scratch.sql

@@ -1,68 +0,0 @@
-:stream_name, na(:position), na(:batch_size), :condition
-
-
-module Defaults
-  def self.position
-    0
-  end
-
-  def self.batch_size
-    1000
-  end
-end
-
-
-- - -
-
-command := 'SELECT * FROM messages WHERE $1';
-RETURN QUERY EXECUTE command USING where_clause;
-
-- - -
-select * from messages where metadata @> '{"correlationStreamName":"someCorrelation"}';
-- - -
-select * from get_messages($$metadata @> '{"correlationStreamName":"someCorrelation"}'$$);
-- - -
-
-
-_sql := format('
-SELECT *
-FROM  (
-   SELECT p.person_id, p.name, p.team, %1$s(s.score)::int AS score
-         ,rank() OVER (PARTITION BY p.team
-                       ORDER BY %1$s(s.score) DESC)::int AS rnk
-    FROM  person p
-    %2$s  score  s USING (person_id)
-    %3$s
-    GROUP BY 1
-   ) sub
-WHERE  rnk < 3
-ORDER  BY team, rnk'
-   , _agg
-   , CASE WHEN _left_join THEN 'LEFT JOIN' ELSE 'JOIN' END
-   , CASE WHEN _where_name <> '' THEN 'WHERE p.name LIKE $1' ELSE '' END
-);
-
--- debug   -- quote when tested ok
--- RAISE NOTICE '%', _sql;
-
--- execute -- unquote when tested ok
-RETURN QUERY EXECUTE _sql
-
-
-- - -
-
-CREATE OR REPLACE FUNCTION get_messages()
-RETURNS SETOF messages
-AS $$
-DECLARE
-  _sql text;
-BEGIN
-
-  _sql := 'RETURN QUERY SELECT * FROM messages'
-
-  -- RETURN QUERY EXECUTE _sql
-
-  RETURN QUERY SELECT * FROM messages;
-END;
-$$ LANGUAGE plpgsql
-VOLATILE;