mcfly 0.0.7 → 0.0.10

data/lib/mcfly/constraint.sql

@@ -0,0 +1,4 @@
+-- Add constraint to make sure o_user_id is set iff obsoleted_dt is
+-- not infinity (i.e. object is obsoleted).
+ALTER TABLE "%{table}" ADD CONSTRAINT check_o_user
+CHECK ((obsoleted_dt = 'Infinity') = (o_user_id IS NULL));

data/lib/mcfly/delete_trig.sql

@@ -4,6 +4,7 @@ AS $$
 
 DECLARE
   whodunnit int;
+  now timestamp;
 
 BEGIN
   IF OLD.obsoleted_dt <> 'infinity' THEN
@@ -12,8 +13,10 @@ BEGIN
 
   SHOW mcfly.whodunnit INTO whodunnit;
 
+  now = now();
+
   UPDATE "%{table}"
-  SET "obsoleted_dt" = 'now()', "o_user_id" = whodunnit WHERE id = OLD.id;
+  SET obsoleted_dt = now, o_user_id = whodunnit WHERE id = OLD.id;
 
   RETURN NULL; -- the row is not actually deleted
 END;

data/lib/mcfly/has_mcfly.rb

@@ -25,14 +25,10 @@ module Mcfly
 
     module ClassMethods
       def has_mcfly(options = {})
-        # FIXME: this methods gets a append_only option sometimes.  It
-        # needs to add model level validations which prevent update
-        # when this option is present. Note that we need to allow
-        # delete.  Deletion of Mcfly objects obsoletes them by setting
-        # obsoleted_dt.
-
         send :include, InstanceMethods
+
         before_validation :record_validation
+        before_destroy    :allow_destroy if options[:append_only]
 
         # FIXME: :created_dt should also be readonly.  However, we set
         # it for debugging purposes.  Should consider making this
@@ -77,6 +73,19 @@ module Mcfly
       def mcfly_belongs_to(name, options = {})
         validates_with Mcfly::Model::AssociationValidator, field: name
         belongs_to(name, options)
+
+        # Store child associations for the parent category
+        # e.g. if HedgeCost is adding a belong_to assoc to HedgeCostCategory
+        # then add HedgeCost and FK to the @@associations array
+        self.reflect_on_all_associations.each do |a|
+          if a.name == name
+            a.klass.class_variable_set(:@@associations, []) unless
+              a.klass.class_variable_defined?(:@@associations)
+
+            a.klass.class_variable_get(:@@associations) << 
+              [a.active_record, a.foreign_key]
+          end
+        end
       end
 
     end
@@ -87,8 +96,23 @@ module Mcfly
           self.user_id = Mcfly.whodunnit.try(:id)
           self.obsoleted_dt ||= 'infinity'
         end
+      end
 
+      def allow_destroy
+        # checks against registered associations
+        if self.class.class_variable_defined?(:@@associations)
+          self.class.class_variable_get(:@@associations).each do |klass, fk|
+            self.errors.add :base, 
+            "#{self.class.name.demodulize} cannot be deleted " +
+            "because #{klass.name.demodulize} records exist" if
+              klass.where("obsoleted_dt = 'infinity' and
+                                     #{fk} = ?", self.id).count > 0
+          end
+        end
+
+        self.errors.blank?
       end
+
     end
     
   end

data/lib/mcfly/insert_trig.sql

@@ -15,7 +15,7 @@ BEGIN
   -- is only useful for debugging.  Consider removing the surronding
   -- IF for production version.
   IF NEW.created_dt IS NULL THEN
-    NEW.created_dt = 'now()';
+    NEW.created_dt = now();
   END IF;
 
   RETURN NEW;
@@ -25,8 +25,3 @@ $$ LANGUAGE plpgsql;
 DROP TRIGGER IF EXISTS %{table}_insert ON %{table};
 CREATE TRIGGER "%{table}_insert" BEFORE INSERT ON "%{table}" FOR EACH ROW
 EXECUTE PROCEDURE "%{table}_insert"();
-
--- Add constraint to make sure o_user_id is set iff obsoleted_dt is
--- not infinity (i.e. object is obsoleted).
-ALTER TABLE "%{table}" ADD CONSTRAINT check_o_user
-CHECK ((obsoleted_dt = 'Infinity') = (o_user_id IS NULL));

data/lib/mcfly/migration.rb

@@ -1,11 +1,26 @@
 class McflyMigration < ActiveRecord::Migration
-  INSERT_TRIG, UPDATE_TRIG, UPDATE_APPEND_ONLY_TRIG, DELETE_TRIG =
-    %w{insert_trig update_trig update_append_only_trig delete_trig}.map { |f|
+  INSERT_TRIG, UPDATE_TRIG, UPDATE_APPEND_ONLY_TRIG, DELETE_TRIG, CONSTRAINT =
+    %w{
+	insert_trig
+	update_trig
+	update_append_only_trig
+	delete_trig
+	constraint
+    }.map { |f|
     File.read(File.dirname(__FILE__) + "/#{f}.sql")
   }
 
   TRIGS = [INSERT_TRIG, UPDATE_TRIG, DELETE_TRIG]
 
+  def add_sql(table_name, include_const)
+    sql_list = self.class::TRIGS +
+      (include_const ? [self.class::CONSTRAINT] : [])
+
+    sql_list.each { |sql|
+      execute sql % {table: table_name}
+    }
+  end
+
   def create_table(table_name, options = {}, &block)
     super { |t|
       t.integer :group_id, null: false
@@ -18,7 +33,7 @@ class McflyMigration < ActiveRecord::Migration
       block.call(t)
     }
 
-    self.class::TRIGS.each {|sql| execute sql % {table: table_name}}
+    add_sql(table_name, true)
   end
 end
 

data/lib/mcfly/update_append_only_trig.sql

@@ -12,8 +12,8 @@ BEGIN
   -- obsoleted.  We return the OLD row so that other field updates are
   -- ignored.  This is used by DELETE.
   IF NEW.obsoleted_dt <> 'infinity' THEN
-     OLD.obsoleted_dt = NEW.obsoleted_dt;
      OLD.o_user_id = NEW.o_user_id;
+     OLD.obsoleted_dt = NEW.obsoleted_dt;
      return OLD;
   END IF;
 

data/lib/mcfly/update_trig.sql

@@ -4,7 +4,6 @@ AS $$
 DECLARE
   rec "%{table}";
   new_id INT4;
-  now timestamp;
   whodunnit int;
 
 BEGIN
@@ -27,10 +26,6 @@ BEGIN
   -- new_id is a new primary key that we'll use for the obsoleted row.
   SELECT nextval('"%{table}_id_seq"') INTO new_id;
 
-  -- not sure if PGSQL will return the same value for now() in the
-  -- same transaction.  So, use the same variable to be sure.
-  now = 'now()';
-
   rec.id = new_id;
   rec.group_id = NEW.id;
   rec.o_user_id = NEW.user_id;
@@ -42,8 +37,8 @@ BEGIN
   IF NEW.created_dt = OLD.created_dt THEN
     -- Set the modified row's created_dt.  The obsoleted_dt field was
     -- already infinity, so we don't need to set it.
-    NEW.created_dt = now;
-    rec.obsoleted_dt = now;
+    NEW.created_dt = now();
+    rec.obsoleted_dt = now();
   ELSE
     IF NEW.created_dt <= OLD.created_dt THEN
       RAISE EXCEPTION 'new created_dt must be greater than old';

data/lib/mcfly/version.rb

@@ -1,3 +1,3 @@
 module Mcfly
-  VERSION = "0.0.7"
+  VERSION = "0.0.10"
 end

data/lib/mcfly.rb

@@ -1,6 +1,7 @@
 require 'mcfly/migration'
 require 'mcfly/has_mcfly'
 require 'mcfly/controller'
+require 'mcfly/version'
 require 'active_support'
 
 module Mcfly

data/mcfly.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
 
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", "~> 3.2.11"
+  s.add_dependency "rails", "~> 3.2.13"
   s.add_dependency "pg"
 
   # FIXME: Delorean is added here for historical reasons.  It should

data/spec/no_trans_spec.rb

@@ -0,0 +1,45 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "Mcfly" do
+  self.use_transactional_fixtures = false
+
+  after(:each) do
+    ActiveRecord::Base.connection.execute("TRUNCATE security_instruments;")
+  end
+
+  before(:each) do
+    Mcfly.whodunnit = TestUser.new(10)
+
+    @dts = ['2001-01-01', '2001-01-05', '2001-01-10']
+
+    @sis = [
+	    ["FN Fix-30 MBS",		"A"],
+	    ["FN Fix-30 Cash",		"A"],
+	    ["FN Fix-30 MBS Blend",	"A"],
+	    ["FN Fix-30 HB MBS",	"A"],
+	   ]
+
+    @sis.each_with_index { |(name, sc), i|
+      si = SecurityInstrument.new(name: name, settlement_class: sc)
+      si.created_dt = @dts[i % @dts.length]
+      si.save!
+    }
+  end
+
+  it "deleted append-only records should have reasonable obsoleted_dt" do
+    @sis[0..3].each { |name, st|
+      osi = SecurityInstrument.find_by_name(name)
+      osi.destroy
+      # p ActiveRecord::Base.connection.execute("select now();").first
+      sleep(2)
+    }
+    t = Time.now
+
+    deltas = @sis[0..3].map { |name, st|
+      (t - SecurityInstrument.find_by_name(name).obsoleted_dt).round
+    }
+
+    deltas.should == [8, 6, 4, 2]
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcfly
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.11
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,7 @@ files:
 - README.md
 - Rakefile
 - lib/mcfly.rb
+- lib/mcfly/constraint.sql
 - lib/mcfly/controller.rb
 - lib/mcfly/delete_trig.sql
 - lib/mcfly/has_mcfly.rb
@@ -154,6 +155,7 @@ files:
 - spec/dummy/public/favicon.ico
 - spec/dummy/script/rails
 - spec/model_spec.rb
+- spec/no_trans_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/arman000/mcfly
 licenses: []