pg_audit_log 0.5.2 → 0.5.4

data/lib/pg_audit_log/extensions/postgresql_adapter.rb

@@ -47,6 +47,10 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
     true
   end
 
+  def set_user_id(user_id = nil)
+    execute_without_pg_audit_log PgAuditLog::Function::user_identifier_temporary_function(user_id || @last_user_id)
+  end
+
   def blank_audit_user_id_and_name
     @last_user_id = @last_unique_name = nil
     true

data/lib/pg_audit_log/function.rb

@@ -1,5 +1,7 @@
 module PgAuditLog
   class Function < PgAuditLog::ActiveRecord
+    DISABLED_USER = -2396
+
     class << self
       def name
         "audit_changes"
@@ -45,6 +47,11 @@ module PgAuditLog
               unique_name varchar;
               column_name varchar;
             BEGIN
+              user_identifier := pg_temp.pg_audit_log_user_identifier();
+              IF user_identifier = #{DISABLED_USER} THEN
+                RETURN NULL;
+              END IF;
+              unique_name := pg_temp.pg_audit_log_user_unique_name();
               primary_key_column := NULL;
               EXECUTE 'SELECT pg_attribute.attname
                        FROM pg_index, pg_class, pg_attribute
@@ -54,8 +61,6 @@ module PgAuditLog
                        AND pg_attribute.attnum = any(pg_index.indkey)
                        AND indisprimary'
               INTO primary_key_column USING TG_RELNAME;
-              user_identifier := pg_temp.pg_audit_log_user_identifier();
-              unique_name := pg_temp.pg_audit_log_user_unique_name();
               primary_key_value := NULL;
 
               FOR col IN SELECT * FROM information_schema.columns WHERE table_name = TG_RELNAME LOOP

data/lib/pg_audit_log/triggers.rb

@@ -49,15 +49,11 @@ module PgAuditLog
       end
 
       def enable
-        tables_with_triggers.each do |table|
-          enable_for_table(table)
-        end
+        connection.set_user_id(nil)
       end
 
       def disable
-        tables_with_triggers.each do |table|
-          disable_for_table(table)
-        end
+        connection.set_user_id(PgAuditLog::Function::DISABLED_USER)
       end
 
       def without_triggers

data/lib/pg_audit_log/version.rb

@@ -1,3 +1,3 @@
 module PgAuditLog
-  VERSION = "0.5.2"
+  VERSION = "0.5.4"
 end

data/pg_audit_log.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/Casecommons/pg_audit_log"
   s.summary     = %q{postgresql only database-level audit logging of all databases changes}
   s.description = %q{A completely transparent audit logging component for your application using a stored procedure and triggers. Comes with specs for your project and a rake task to generate the reverse SQL to undo changes logged}
+  s.post_install_message = %q{Please run PgAuditLog::Function.install (in console/migration) to install the new versions of the database functions}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/triggers_spec.rb

@@ -110,6 +110,8 @@ describe PgAuditLog::Triggers do
       end
 
       it "should not fire the audit" do
+        PgAuditLog::Function.install
+
         PgAuditLog::Triggers.disable
         expect {
           TableWithTriggers.create!
@@ -117,6 +119,21 @@ describe PgAuditLog::Triggers do
       end
     end
 
+    describe ".without_triggers" do
+      it "should record the user correctly afterwards" do
+        PgAuditLog::Triggers.without_triggers do
+          expect {
+            TableWithTriggers.create!
+          }.to_not change(PgAuditLog::Entry, :count)
+        end
+
+        expect {
+          TableWithTriggers.create!
+        }.to change(PgAuditLog::Entry, :count)
+        PgAuditLog::Entry.last.user_id.should == -1
+      end
+    end
+
     describe ".create_for_table" do
       context "for a table that already has a trigger" do
         it "should not blow up" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_audit_log
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -130,7 +130,8 @@ files:
 - spec/triggers_spec.rb
 homepage: https://github.com/Casecommons/pg_audit_log
 licenses: []
-post_install_message: 
+post_install_message: Please run PgAuditLog::Function.install (in console/migration)
+  to install the new versions of the database functions
 rdoc_options: []
 require_paths:
 - lib
@@ -142,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -957079026031119137
+      hash: 3807464180291971898
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -957079026031119137
+      hash: 3807464180291971898
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19