phobos_db_checkpoint 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a63376197697c40c39c9bdf591800eb664e94a
-  data.tar.gz: 6eb6a3c254683519a39a0170ae17f640109c97fd
+  metadata.gz: bded9e44c71ab913e667bd410909c32349a80d95
+  data.tar.gz: bbe38ca65038fd8fe9c768d6b5a2342b6498cf8d
 SHA512:
-  metadata.gz: e19cdd1f43137d43ca368bbcdeb5fe3681d9ab77fc0a17e679e0472e7c042ed1e29fbdccf2c9f5694d70922987c04ecaddad77135caa37ae421e06040b5ebebe
-  data.tar.gz: e0db0427dec26307dde803eb362c13a47088e706947b9ec4ac20e95d867939482cd17ad2e0ac87951a2e4082887ec2153dc5bde694bc99df27337efc61844852
+  metadata.gz: dc3d96c808dfaabd944eeb5851dd57b5e62bf386f78897d885df524d908e3d94cf9bb72999e93899571043d804338737b95d5acbb9503d3e318c438c1f441e2d
+  data.tar.gz: 5a2d60b0c1e9ef12eb57072f0013b0af5e74eac4a32a64fb75018abd302ecfda0b62a95d56b1dded8456f7263694186e72d38de66316b37a900141af0d986028

data/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 2.3.0 (2017-03-08)
+
+- [enhancement] Add created_at to events table
+
 ## 2.2.0 (2017-03-08)
 
 - [enhancement] Add delete failure end point

data/README.md

@@ -299,6 +299,10 @@ The following payload is included for all notifications:
 
 ## <a name="upgrading"></a> Upgrading
 
+#### From 2.2.0 >= _version_ >= 2.0.0 to 2.3.0
+
+The database table for Event has had created_at added to it, run `phobos_db_checkpoint copy-migrations` in your project to receive the migration.
+
 #### From <2.0 to 2.x
 
 ##### Rename database tables

data/lib/phobos_db_checkpoint/cli.rb

@@ -34,23 +34,35 @@ module PhobosDBCheckpoint
              aliases: ['-d'],
              default: 'db/migrate',
              banner: 'Destination folder relative to your project'
+      option :config,
+             aliases: ['-c'],
+             default: 'config/database.yml',
+             banner: 'Database configuration relative to your project'
       def copy_migrations
+        if options[:config]
+          ENV['DB_CONFIG'] = options[:config]
+        end
+
+        unless active_connection?
+          PhobosDBCheckpoint.configure(pool_size: 1)
+        end
+
         destination_fullpath = File.join(destination_root, options[:destination])
         generated_migrations = list_migrations(destination_fullpath)
         FileUtils.mkdir_p(destination_fullpath)
-
+        file_path = nil
         template_migrations_metadata.each do |metadata|
-
           if migration_exists?(generated_migrations, metadata[:name])
             say_status('exists', metadata[:name])
-
           else
             file_path = File.join(options[:destination], "#{metadata[:number]}_#{metadata[:name]}")
             template_path = File.join('templates/migrate', metadata[:path])
             template(template_path, file_path)
           end
-
         end
+      rescue
+        FileUtils.rm_f(file_path.to_s)
+        raise
       end
 
       desc 'migration NAME', 'Generates a new migration with the given name. Use underlines (_) as a separator, ex: add_new_column'
@@ -117,6 +129,14 @@ module PhobosDBCheckpoint
       def new_migration_template
         File.join(self.class.source_root, 'templates/new_migration.rb.erb')
       end
+
+      def active_connection?
+        ActiveRecord::Base
+          .connection_pool
+          .with_connection { |con| con.active? }
+      rescue
+        false
+      end
     end
   end
 end

data/lib/phobos_db_checkpoint/event.rb

@@ -3,6 +3,10 @@ module PhobosDBCheckpoint
     include PhobosDBCheckpoint::EventHelper
     after_initialize :assign_checksum
 
+    scope :order_by_event_time_and_created_at, -> {
+      order('event_time desc nulls last', 'created_at desc nulls last')
+    }
+
     def exists?
       Event.where(topic: topic, group_id: group_id, checksum: checksum).exists?
     end

data/lib/phobos_db_checkpoint/events_api.rb

@@ -75,7 +75,7 @@ module PhobosDBCheckpoint
       query = query.where(event_type: params['event_type']) if params['event_type']
 
       query
-        .order(event_time: :desc)
+        .order_by_event_time_and_created_at
         .limit(limit)
         .offset(offset)
         .to_json
@@ -94,7 +94,7 @@ module PhobosDBCheckpoint
       query = query.where(event_type: params['event_type']) if params['event_type']
 
       query
-        .order(event_time: :desc)
+        .order_by_event_time_and_created_at
         .limit(limit)
         .offset(offset)
         .to_json

data/lib/phobos_db_checkpoint/failure.rb

@@ -2,6 +2,10 @@ module PhobosDBCheckpoint
   class Failure < ActiveRecord::Base
     include PhobosDBCheckpoint::EventHelper
 
+    scope :order_by_event_time_and_created_at, -> {
+      order('event_time desc nulls last', 'created_at desc nulls last')
+    }
+
     def self.record(event:, event_metadata:, exception: nil)
       return if exists?(event_metadata[:checksum])
 

data/lib/phobos_db_checkpoint/tasks.rb

@@ -17,6 +17,5 @@ module PhobosDBCheckpoint
     end
 
     load 'active_record/railties/databases.rake'
-
   end
 end

data/lib/phobos_db_checkpoint/version.rb

@@ -1,3 +1,3 @@
 module PhobosDBCheckpoint
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

data/templates/migrate/phobos_01_create_events.rb.erb

@@ -1,4 +1,4 @@
-class Phobos01CreateEvents < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+class Phobos01CreateEvents < ActiveRecord::Migration[<%= ActiveRecord::VERSION::STRING.to_f %>]
   def up
     create_table :phobos_db_checkpoint_events do |t|
       t.string    :topic,         index: true

data/templates/migrate/phobos_02_create_failures.rb.erb

@@ -1,7 +1,7 @@
-class Phobos02CreateFailures < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
+class Phobos02CreateFailures < ActiveRecord::Migration[<%= ActiveRecord::VERSION::STRING.to_f %>]
   def up
     create_table :phobos_db_checkpoint_failures do |t|
-      t.timestamp :created_at,     index: false
+      t.timestamp :created_at,     index: true
       t.string    :topic,          index: true
       t.string    :group_id,       index: true
       t.string    :entity_id,      index: true

data/templates/migrate/phobos_03_add_created_at_to_events.rb.erb

@@ -0,0 +1,38 @@
+class Phobos03AddCreatedAtToEvents < ActiveRecord::Migration[<%= ActiveRecord::VERSION::STRING.to_f %>]
+  def up
+    add_column :phobos_db_checkpoint_events, :created_at, :datetime
+
+    add_index :phobos_db_checkpoint_events,
+      [:event_time],
+      name: :phobos_events_event_time_desc_nulls_last_idx,
+      order: {event_time: 'desc nulls last'},
+      using: :btree
+
+    add_index :phobos_db_checkpoint_events,
+      [:created_at],
+      name: :phobos_events_created_at_desc_nulls_last_idx,
+      order: {created_at: 'desc nulls last'},
+      using: :btree
+
+    add_index :phobos_db_checkpoint_failures,
+      [:event_time],
+      name: :phobos_failures_event_time_desc_nulls_last_idx,
+      order: {event_time: 'desc nulls last'},
+      using: :btree
+
+    add_index :phobos_db_checkpoint_failures,
+      [:created_at],
+      name: :phobos_failures_created_at_desc_nulls_last_idx,
+      order: {created_at: 'desc nulls last'},
+      using: :btree
+  end
+
+  def down
+    remove_index :phobos_db_checkpoint_events, name: :phobos_events_event_time_desc_nulls_last_idx
+    remove_index :phobos_db_checkpoint_events, name: :phobos_events_created_at_desc_nulls_last_idx
+    remove_index :phobos_db_checkpoint_failures, name: :phobos_failures_event_time_desc_nulls_last_idx
+    remove_index :phobos_db_checkpoint_failures, name: :phobos_failures_created_at_desc_nulls_last_idx
+
+    remove_column :phobos_db_checkpoint_events, :created_at
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phobos_db_checkpoint
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Túlio Ornelas
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -269,6 +269,7 @@ files:
 - templates/database.yml.example
 - templates/migrate/phobos_01_create_events.rb.erb
 - templates/migrate/phobos_02_create_failures.rb.erb
+- templates/migrate/phobos_03_add_created_at_to_events.rb.erb
 - templates/new_migration.rb.erb
 - templates/phobos_boot.rb
 homepage: https://github.com/klarna/phobos_db_checkpoint
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Phobos DB Checkpoint is a plugin to Phobos and is meant as a drop in replacement