saseo 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8584935e166a1c98a8850d9247901ed8d5d4d68e
-  data.tar.gz: a7f7978c8849140dc105cbe2c67cec42494a179e
+  metadata.gz: 8ace1b2a4acc3bc9335423feaa6ac2683d316c05
+  data.tar.gz: 539126fd909b07cb23d26775b9925892d7b0d078
 SHA512:
-  metadata.gz: 052d69970c0f6eef0023976c481d9d1372bc075dd343cbd3ad6f5c553518f512331188d5b8a3fc3193ef632e7d7dcf3bd31edbceae3aaf470157279cabd37ce5
-  data.tar.gz: 435bc66217e046e9d3ccdb884f83b55b09b6163058995b446ff72f209a4128da730eb6dd03e679cb11fb6d90dc1aee9bf1078ceac98401531ce22909e2c8205c
+  metadata.gz: 2477b4227cf676ae414d8d42fbc2a306b46aa48ed53d2b14b2d9542db00d6b08093d2f597b5ee71b6fbd080d579060483d4caa4148a06038c007ad25570395bf
+  data.tar.gz: 28a75ce72cffcb90be7b39307b73f8230c4223b53265f64f8a7e84283b968ca02c11b9fe8ce3246c600b5932f1e9faacae1cead6caf1016c919ae2a2a80faae5

data/db/saseo/migrate/20151108210618_add_indexes.rb

@@ -0,0 +1,9 @@
+class AddIndexes < ActiveRecord::Migration
+  def change
+    add_index :saseo_versions, [:transaction_id, :table_name, :item_id], name: :saseo_transaction_item_id_idx
+    add_index :saseo_versions, [:table_name, :action_timestamp, :item_id], name: :saseo_item_id_idx
+
+    add_index :saseo_versions, [:transaction_id, :table_name, :item_uuid], name: :saseo_transaction_item_uuid_idx
+    add_index :saseo_versions, [:table_name, :action_timestamp, :item_uuid], name: :saseo_item_uuid_idx
+  end
+end

data/db/saseo/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151028181502) do
+ActiveRecord::Schema.define(version: 20151108210618) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -29,4 +29,9 @@ ActiveRecord::Schema.define(version: 20151028181502) do
     t.jsonb    "new_data"
   end
 
+  add_index "saseo_versions", ["table_name", "action_timestamp", "item_id"], name: "saseo_item_id_idx", using: :btree
+  add_index "saseo_versions", ["table_name", "action_timestamp", "item_uuid"], name: "saseo_item_uuid_idx", using: :btree
+  add_index "saseo_versions", ["transaction_id", "table_name", "item_id"], name: "saseo_transaction_item_id_idx", using: :btree
+  add_index "saseo_versions", ["transaction_id", "table_name", "item_uuid"], name: "saseo_transaction_item_uuid_idx", using: :btree
+
 end

data/db/saseo_source/migrate/20151028181502_initial_schema.rb

@@ -1,9 +1,9 @@
 class InitialSchema < ActiveRecord::Migration
-  def change
-
+  def up
     enable_extension 'uuid-ossp'
+    execute 'CREATE SCHEMA saseo'
 
-    create_table 'saseo_source_versions', id: :uuid, force: true do |t|
+    create_table 'saseo.saseo_source_versions', id: :uuid, force: true do |t|
       t.integer 'transaction_id', null: false, limit: 8 # bigint
       t.string 'table_name', null: false
       t.string 'action', null: false
@@ -13,4 +13,10 @@ class InitialSchema < ActiveRecord::Migration
       t.jsonb 'new_data'
     end
   end
+
+  def down
+    drop_table 'saseo.saseo_source_versions'
+    disable_extension 'uuid-ossp'
+    execute 'DROP SCHEMA IF EXISTS saseo'
+  end
 end

data/db/saseo_source/schema.rb

@@ -17,14 +17,4 @@ ActiveRecord::Schema.define(version: 20151028181502) do
   enable_extension "plpgsql"
   enable_extension "uuid-ossp"
 
-  create_table "saseo_source_versions", id: :uuid, default: "uuid_generate_v4()", force: :cascade do |t|
-    t.integer  "transaction_id",   limit: 8, null: false
-    t.string   "table_name",                 null: false
-    t.string   "action",                     null: false
-    t.datetime "action_timestamp",           null: false
-    t.string   "whodunnit",                  null: false
-    t.jsonb    "old_data"
-    t.jsonb    "new_data"
-  end
-
 end

data/lib/generators/saseo/templates/add_saseo_trigger.rb.erb

@@ -3,7 +3,7 @@ class AddSaseoTriggerTo<%= @table_name.camelcase %> < ActiveRecord::Migration
     # originally copied from:
     # https://wiki.postgresql.org/wiki/Audit_trigger
     trigger_definition = <<SQL
-CREATE TRIGGER <%= @table_name %>_saseo_trigger AFTER INSERT OR UPDATE OR DELETE ON <%= @table_name %> FOR EACH ROW EXECUTE PROCEDURE saseo_audit_func();
+CREATE TRIGGER <%= @table_name %>_saseo_trigger AFTER INSERT OR UPDATE OR DELETE ON <%= @table_name %> FOR EACH ROW EXECUTE PROCEDURE saseo.audit_func();
 SQL
     execute(trigger_definition)
   end

data/lib/generators/saseo/templates/add_saseo_trigger_function.rb

@@ -4,7 +4,9 @@ class AddSaseoTriggerFunction < ActiveRecord::Migration
     uuid_extension_sql = 'CREATE EXTENSION IF NOT EXISTS "uuid-ossp"'
 
     audit_table_sql = <<SQL
-CREATE TABLE saseo_source_versions (
+CREATE schema saseo;
+
+CREATE TABLE saseo.saseo_source_versions (
   id uuid PRIMARY KEY NOT NULL DEFAULT uuid_generate_v4(),
   transaction_id bigint NOT NULL,
   table_name text NOT NULL,
@@ -13,19 +15,18 @@ CREATE TABLE saseo_source_versions (
   whodunnit text NOT NULL,
   old_data jsonb,
   new_data jsonb
-)
-SQL
-
+);
 
+SQL
     # originally copied from:
     # https://wiki.postgresql.org/wiki/Audit_trigger
     #
     # modified to use NOTIFY
     #
     # a trigger must be added to every table
-    # CREATE TRIGGER identities_saseo_trigger AFTER INSERT OR UPDATE OR DELETE ON identities FOR EACH ROW EXECUTE PROCEDURE saseo_audit_func();
+    # CREATE TRIGGER identities_saseo_trigger AFTER INSERT OR UPDATE OR DELETE ON identities FOR EACH ROW EXECUTE PROCEDURE saseo.audit_func();
     whodunnit_sql = <<SQL
-CREATE OR REPLACE FUNCTION saseo_whodunnit() RETURNS TEXT AS $body$
+CREATE OR REPLACE FUNCTION saseo.whodunnit() RETURNS TEXT AS $body$
 BEGIN
   return current_setting('saseo.whodunnit');
 EXCEPTION WHEN undefined_object THEN
@@ -35,7 +36,7 @@ $body$
 LANGUAGE plpgsql
 SQL
     audit_sql = <<SQL
-CREATE OR REPLACE FUNCTION saseo_audit_func() RETURNS TRIGGER AS $body$
+CREATE OR REPLACE FUNCTION saseo.audit_func() RETURNS TRIGGER AS $body$
 DECLARE
   v_old_data json;
   v_new_data json;
@@ -43,7 +44,7 @@ DECLARE
   v_channel text;
   v_audit_uuid uuid;
 BEGIN
-   v_whodunnit := saseo_whodunnit();
+   v_whodunnit := saseo.whodunnit();
    v_audit_uuid := uuid_generate_v4();
 
   v_channel := upper('SASEO' || '_' || TG_TABLE_NAME::TEXT || '_' || TG_OP || '_AUDIT');
@@ -52,38 +53,38 @@ BEGIN
     v_old_data := row_to_json(OLD);
     v_new_data := row_to_json(NEW);
 
-    INSERT INTO saseo_source_versions VALUES(v_audit_uuid, txid_current(), TG_TABLE_NAME, DEFAULT, TG_OP, v_whodunnit, v_old_data::JSONB, v_new_data::JSONB);
+    INSERT INTO saseo.saseo_source_versions VALUES(v_audit_uuid, txid_current(), TG_TABLE_NAME, DEFAULT, TG_OP, v_whodunnit, v_old_data::JSONB, v_new_data::JSONB);
     PERFORM pg_notify(v_channel, v_audit_uuid::TEXT);
 
     RETURN NEW;
   ELSIF (TG_OP = 'DELETE') THEN
     v_old_data := row_to_json(OLD);
 
-    INSERT INTO saseo_source_versions VALUES(v_audit_uuid, txid_current(), TG_TABLE_NAME, DEFAULT, TG_OP, v_whodunnit, v_old_data::JSONB, NULL);
+    INSERT INTO saseo.saseo_source_versions VALUES(v_audit_uuid, txid_current(), TG_TABLE_NAME, DEFAULT, TG_OP, v_whodunnit, v_old_data::JSONB, NULL);
     PERFORM pg_notify(v_channel, v_audit_uuid::TEXT);
 
     RETURN OLD;
   ELSIF (TG_OP = 'INSERT') THEN
     v_new_data := row_to_json(NEW);
 
-    INSERT INTO saseo_source_versions VALUES(v_audit_uuid, txid_current(), TG_TABLE_NAME, DEFAULT, TG_OP, v_whodunnit, NULL, v_new_data::JSONB);
+    INSERT INTO saseo.saseo_source_versions VALUES(v_audit_uuid, txid_current(), TG_TABLE_NAME, DEFAULT, TG_OP, v_whodunnit, NULL, v_new_data::JSONB);
     PERFORM pg_notify(v_channel, v_audit_uuid::TEXT);
 
     RETURN NEW;
   ELSE
-      RAISE WARNING '[SASEO_AUDIT_FUNC] - Other action occurred: %, at %',TG_OP,now();
+      RAISE WARNING '[SASEO.AUDIT_FUNC] - Other action occurred: %, at %',TG_OP,now();
       RETURN NULL;
   END IF;
 
 EXCEPTION
   WHEN data_exception THEN
-    RAISE WARNING '[SASEO_AUDIT_FUNC] - UDF ERROR [DATA EXCEPTION] - SQLSTATE: %, SQLERRM: %',SQLSTATE,SQLERRM;
+    RAISE WARNING '[SASEO.AUDIT_FUNC] - UDF ERROR [DATA EXCEPTION] - SQLSTATE: %, SQLERRM: %',SQLSTATE,SQLERRM;
     RETURN NULL;
   WHEN unique_violation THEN
-    RAISE WARNING '[SASEO_AUDIT_FUNC] - UDF ERROR [UNIQUE] - SQLSTATE: %, SQLERRM: %',SQLSTATE,SQLERRM;
+    RAISE WARNING '[SASEO.AUDIT_FUNC] - UDF ERROR [UNIQUE] - SQLSTATE: %, SQLERRM: %',SQLSTATE,SQLERRM;
     RETURN NULL;
   WHEN OTHERS THEN
-    RAISE WARNING '[SASEO_AUDIT_FUNC] - UDF ERROR [OTHER] - SQLSTATE: %, SQLERRM: %',SQLSTATE,SQLERRM;
+    RAISE WARNING '[SASEO.AUDIT_FUNC] - UDF ERROR [OTHER] - SQLSTATE: %, SQLERRM: %',SQLSTATE,SQLERRM;
     RETURN NULL;
 END;
 $body$
@@ -96,9 +97,9 @@ SQL
   end
 
   def down
-    execute('DROP FUNCTION IF EXISTS saseo_audit_func() CASCADE')
-    execute('DROP FUNCTION IF EXISTS saseo_whodunnit() CASCADE')
-    execute('DROP TABLE IF EXISTS saseo_source_versions CASCADE')
+    execute('DROP FUNCTION IF EXISTS saseo.audit_func() CASCADE')
+    execute('DROP FUNCTION IF EXISTS saseo.whodunnit() CASCADE')
+    execute('DROP TABLE IF EXISTS saseo.saseo_source_versions CASCADE')
     execute('DROP EXTENSION IF EXISTS "uuid-ossp" CASCADE')
 
   end

data/lib/saseo/config/defaults.rb

@@ -8,6 +8,7 @@ module Saseo
       DATABASE_URL                   = nil
       DATABASE_CONFIG_PATH           = 'saseo/config/saseo_database.yml'
       TABLE_NAME                     = 'saseo_versions'
+      SOURCE_TABLE_SCHEMA            = 'saseo'
       SOURCE_TABLE_NAME              = 'saseo_source_versions'
       CONSUMER_PHILOTIC_SUBSCRIPTION = 'saseo_audit'
 

data/lib/saseo/models/source/version.rb

@@ -5,7 +5,7 @@ module Saseo
   module Models
     module Source
       class Version < Saseo::Models::Source::Base
-        self.table_name = Saseo.config.source_table_name
+        self.table_name = "#{Saseo.config.source_table_schema}.#{Saseo.config.source_table_name}"
 
         validates :transaction_id, presence: true
         validates :table_name, presence: true

data/lib/saseo/publishing/publisher.rb

@@ -21,7 +21,7 @@ module Saseo
 
       def channels=(val)
         if val == :all
-          tables = Saseo::Models::Source::Base.connection.tables
+          tables = db_connection.tables
 
           @channels = tables.reduce([]) do |channels, table|
             %w[insert update delete].each do |operation|
@@ -38,19 +38,21 @@ module Saseo
         self.channels = channels
         listen channels: self.channels, loop: loop, timeout: timeout do |channel, pid, payload|
           uuid = payload
-          logger.debug { "received NOTIFY for source version: #{uuid}"}
-          Saseo::Models::Source::Base.transaction do
+          logger.debug { "received NOTIFY for source version: #{uuid}" }
 
-            record = Saseo::Models::Source::Version.find(uuid)
-            Saseo::Publishing::DataChangeMessage.publish(record)
-            record.delete
-            logger.debug { "deleted source version: #{uuid}"}
-          end
+          record = Saseo::Models::Source::Version.find(uuid)
+          Saseo::Publishing::DataChangeMessage.publish(record)
+          record.delete
+          logger.debug { "deleted source version: #{uuid}" }
         end
       end
 
+      def db_connection
+        Saseo::Models::Source::Base.connection
+      end
+
       def notify(channel, payload)
-        conn = Saseo::Models::Source::Base.connection.instance_variable_get(:@connection)
+        conn = db_connection.instance_variable_get(:@connection)
         conn.async_exec "SELECT pg_notify('#{channel}', '#{payload.to_s}')"
       end
 

data/lib/saseo/version.rb

@@ -1,3 +1,3 @@
 module Saseo
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: saseo
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Keyes
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -201,6 +201,7 @@ files:
 - bin/console
 - bin/setup
 - db/saseo/migrate/20151028181502_initial_schema.rb
+- db/saseo/migrate/20151108210618_add_indexes.rb
 - db/saseo/schema.rb
 - db/saseo_source/migrate/20151028181502_initial_schema.rb
 - db/saseo_source/schema.rb