evt-event_source-postgres 0.12.0.1 → 0.12.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c8bceab129dc1394f115298795e21927bd0742
-  data.tar.gz: 28be18c65c329654e1ccc84a5e7bbd7f26c235ff
+  metadata.gz: fea4a1a5b5061640f1dc909255300399e6496dae
+  data.tar.gz: b88748ea3a15f16d181dc6029002d1b637018150
 SHA512:
-  metadata.gz: b5f151dd726bb7b53f6225442a5ae17c371458c4fb700547b3315e4413d891ec73b6f0871c414d1f2a4353ecb30c86ffcc26e3697d9352a8d69aecf4f4cc9ef8
-  data.tar.gz: e22187b7a220799903970dab0a8cb0edacf7f9b52d51d6f353cf910a1ceaf1fe57d12ce4a0fd624bc7dcebece5a5461cc73f32cbbe4f4b5cafdf2ebfc87dc724
+  metadata.gz: 4f74e09e9395d8d798123d350a257a5f16c35f480158d02c1e8483ddd6b710badcc11d729be41d207b77cb3963570b23a4343bfcb9726f4743eeec22600648ea
+  data.tar.gz: 952eec25fdf3c39c07d502326b7001967c9cf5691b7143158a750b2648e0d1a0e3e75d60312a33e94107bd79776b833682b821f651a56f492d447b76c3437172

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

@@ -5,10 +5,17 @@ module EventSource
         def self.call(instances: nil, stream_name: nil, event: nil, category: nil)
           instances ||= 1
           stream_name ||= StreamName.example(category: category)
+
+          event_specified = !event.nil?
+
           event ||= EventData::Write.example
 
           instances.times do
             EventSource::Postgres::Put.(event, stream_name)
+
+            unless event_specified
+              event.id = EventData::Write.id
+            end
           end
 
           stream_name

data/lib/event_source/postgres/get/select_statement.rb

@@ -36,6 +36,7 @@ module EventSource
 
           statement = <<-SQL
             SELECT
+              id::varchar,
               stream_name::varchar,
               position::int,
               type::varchar,

data/lib/event_source/postgres/put.rb

@@ -30,37 +30,41 @@ module EventSource
         logger.trace { "Putting event data (Stream Name: #{stream_name}, Type: #{write_event.type}, Expected Version: #{expected_version.inspect})" }
         logger.trace(tags: [:data, :event_data]) { write_event.pretty_inspect }
 
-        type, data, metadata = destructure_event(write_event)
+        id, type, data, metadata = destructure_event(write_event)
         expected_version = ExpectedVersion.canonize(expected_version)
 
-        insert_event(stream_name, type, data, metadata, expected_version).tap do |position|
-          logger.info { "Put event data (Position: #{position}, Stream Name: #{stream_name}, Type: #{write_event.type}, Expected Version: #{expected_version.inspect})" }
+        insert_event(id, stream_name, type, data, metadata, expected_version).tap do |position|
+          logger.info { "Put event data (Position: #{position}, Stream Name: #{stream_name}, Type: #{write_event.type}, Expected Version: #{expected_version.inspect}, ID: #{id.inspect})" }
           logger.info(tags: [:data, :event_data]) { write_event.pretty_inspect }
         end
       end
 
       def destructure_event(write_event)
+        id = write_event.id
         type = write_event.type
         data = write_event.data
         metadata = write_event.metadata
 
+        logger.debug(tags: [:data, :event_data]) { "ID: #{id.pretty_inspect}" }
+        logger.debug(tags: [:data, :event_data]) { "Type: #{type.pretty_inspect}" }
         logger.debug(tags: [:data, :event_data]) { "Data: #{data.pretty_inspect}" }
         logger.debug(tags: [:data, :event_data]) { "Metadata: #{metadata.pretty_inspect}" }
 
-        return type, data, metadata
+        return id, type, data, metadata
       end
 
-      def insert_event(stream_name, type, data, metadata, expected_version)
+      def insert_event(id, stream_name, type, data, metadata, expected_version)
         serialized_data = serialized_data(data)
         serialized_metadata = serialized_metadata(metadata)
-        records = execute_query(stream_name, type, serialized_data, serialized_metadata, expected_version)
+        records = execute_query(id, stream_name, type, serialized_data, serialized_metadata, expected_version)
         position(records)
       end
 
-      def execute_query(stream_name, type, serialized_data, serialized_metadata, expected_version)
-        logger.trace { "Executing insert (Stream Name: #{stream_name}, Type: #{type}, Expected Version: #{expected_version.inspect})" }
+      def execute_query(id, stream_name, type, serialized_data, serialized_metadata, expected_version)
+        logger.trace { "Executing insert (Stream Name: #{stream_name}, Type: #{type}, Expected Version: #{expected_version.inspect}, ID: #{id.inspect})" }
 
         params = [
+          id,
           stream_name,
           type,
           serialized_data,
@@ -74,13 +78,13 @@ module EventSource
           raise_error e
         end
 
-        logger.debug { "Executed insert (Stream Name: #{stream_name}, Type: #{type}, Expected Version: #{expected_version.inspect})" }
+        logger.debug { "Executed insert (Stream Name: #{stream_name}, Type: #{type}, Expected Version: #{expected_version.inspect}, ID: #{id.inspect})" }
 
         records
       end
 
       def self.statement
-        @statement ||= "SELECT write_event($1::varchar, $2::varchar, $3::jsonb, $4::jsonb, $5::int);"
+        @statement ||= "SELECT write_event($1::varchar, $2::varchar, $3::varchar, $4::jsonb, $5::jsonb, $6::int);"
       end
 
       def serialized_data(data)

data/lib/event_source/postgres/session.rb

@@ -29,7 +29,7 @@ module EventSource
       end
 
       def connect
-        logger.trace "Connecting to database"
+        logger.trace { "Connecting to database" }
 
         if connected?
           logger.debug { "Already connected. A new connection will not be built." }
@@ -81,14 +81,22 @@ module EventSource
       end
 
       def execute(statement, params=nil)
+        logger.trace { "Executing statement" }
+        logger.trace(tag: :data) { statement }
+        logger.trace(tag: :data) { params.pretty_inspect }
+
         unless connected?
           connect
         end
 
         if params.nil?
-          connection.exec(statement)
+          connection.exec(statement).tap do
+            logger.debug { "Executed statement" }
+          end
         else
-          connection.exec_params(statement, params)
+          connection.exec_params(statement, params).tap do
+            logger.debug { "Executed statement with params" }
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-event_source-postgres
 version: !ruby/object:Gem::Version
-  version: 0.12.0.1
+  version: 0.12.1.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-event_source