evt-message_store-postgres 2.4.3.0 → 2.4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 783bbb06bda7af60c00b66718b7021bee6256015988750a57140ff5ae5341543
-  data.tar.gz: c4c78ce65e907449deb15fcc0d3cc967d54d8d30f7b6b739a8ccba3bac16f3b1
+  metadata.gz: 9afe602df7bc11f064fb1f2ee2db10d297ef473b56d8d596f043731720610b89
+  data.tar.gz: e281822fa90831def64c49046adeb0732ed42239ff6c2797741094da8b745b15
 SHA512:
-  metadata.gz: 5962708259cb74332b6541a7db9f718891b602e5f6b65f879293f346c101d2da0c46c70a2e7082b2553fb835c0b46f6f4c475f26ebe765d2fcf7bc1651b2d442
-  data.tar.gz: 50d0e5972458e886a69cce45aff22c51cf7f55b712914133b912b1f12e7df94a3791df3b73304dd31a7119b1a81168d601ecbe0f9cc9ca37e2c2e3e09a55b4c6
+  metadata.gz: d5b4471ecd79e6e7b0ebad9b2cfc5f9b71c4fd0b4e3f59e59669980c14d97748cec2a04db2257343bd8f0cc0cc8347ba481f65727005b58f370fde018ea8eeb1
+  data.tar.gz: 6dd9d99f28d3d5cd8cb66227d76997b0860866728902de5705b25b6737e12454c77ad930a9782a61ce2b04e2562a38be45042bd8f04d65f90a75a226f4521cf4

data/lib/message_store/postgres/controls/put.rb

@@ -2,14 +2,14 @@ module MessageStore
   module Postgres
     module Controls
       module Put
-        def self.call(instances: nil, stream_name: nil, message_data: nil, message: nil, category: nil)
+        def self.call(instances: nil, stream_name: nil, message_data: nil, message: nil, category: nil, type: nil)
           instances ||= 1
           stream_name ||= StreamName.example(category: category)
           message_data ||= message
 
           message_specified = !message_data.nil?
 
-          message_data ||= MessageData::Write.example
+          message_data ||= MessageData::Write.example(type: type)
 
           position = nil
           instances.times do

data/lib/message_store/postgres/get/stream/last.rb

@@ -11,10 +11,10 @@ module MessageStore
             Session.configure(self, session: session)
           end
 
-          def call(stream_name)
+          def call(stream_name, type: nil)
             logger.trace(tag: :get) { "Getting last message data (Stream Name: #{stream_name})" }
 
-            result = get_result(stream_name)
+            result = get_result(stream_name, type)
 
             return nil if result.nil?
 
@@ -26,14 +26,11 @@ module MessageStore
             message_data
           end
 
-          def get_result(stream_name)
+          def get_result(stream_name, type)
             logger.trace(tag: :get) { "Getting last record (Stream: #{stream_name})" }
 
-            sql_command = self.class.sql_command(stream_name)
-
-            parameter_values = [
-              stream_name
-            ]
+            parameter_values = parameter_values(stream_name, type)
+            sql_command = sql_command(type)
 
             result = session.execute(sql_command, parameter_values)
 
@@ -44,12 +41,38 @@ module MessageStore
             result
           end
 
-          def self.sql_command(stream_name)
-            parameters = '$1::varchar'
+          def sql_command(type)
+            parameters = parameters(type)
 
             "SELECT * FROM get_last_stream_message(#{parameters});"
           end
 
+          def parameters(type)
+            parameters = "$1::varchar"
+
+            # Backwards compatibility with versions of message-db that do not
+            # support the type parameter - Aaron, Scott, Tue Jul 12 2022
+            if not type.nil?
+              parameters << ", $2::varchar"
+            end
+
+            parameters
+          end
+
+          def parameter_values(stream_name, type)
+            parameter_values = [
+              stream_name
+            ]
+
+            # Backwards compatibility with versions of message-db that do not
+            # support the type parameter - Aaron, Scott, Tue Jul 12 2022
+            if not type.nil?
+              parameter_values << type
+            end
+
+            parameter_values
+          end
+
           def convert(record)
             logger.trace(tag: :get) { "Converting record to message data" }
 

data/lib/message_store/postgres/session.rb

@@ -91,8 +91,12 @@ module MessageStore
       alias :open? :connected?
 
       def close
+        if connection.nil?
+          return
+        end
+
         connection.close
-        connection = nil
+        self.connection = nil
       end
 
       def reset
@@ -108,8 +112,6 @@ module MessageStore
           connect
         end
 
-        executed_time = nil
-
         if params.nil?
           connection.exec(sql_command).tap do
             self.executed_time = clock.now

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-message_store-postgres
 version: !ruby/object:Gem::Version
-  version: 2.4.3.0
+  version: 2.4.4.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: scripts
 cert_chain: []
-date: 2022-02-14 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-message_store