pg_audit_log 0.5.4 → 0.5.5

data/lib/pg_audit_log/function.rb

@@ -23,12 +23,24 @@ module PgAuditLog
         "last_accessed_at"
       end
 
+      def pg_audit_log_old_style_user_id
+        defined?(Rails) && Rails.configuration.pg_audit_log_old_style_user_id rescue false
+      end
+
       def user_identifier_temporary_function(user_id)
-        "CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_identifier() RETURNS integer AS 'SELECT #{user_id}' LANGUAGE SQL STABLE;"
+        if pg_audit_log_old_style_user_id
+          "SET audit.user_id = #{user_id || -1};"
+        else
+          "CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_identifier() RETURNS integer AS 'SELECT #{user_id}' LANGUAGE SQL STABLE;"
+        end
       end
 
       def user_unique_name_temporary_function(username)
-        "CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_unique_name() RETURNS varchar AS $_$ SELECT '#{PGconn.escape_bytea(username)}'::varchar $_$ LANGUAGE SQL STABLE;"
+        if pg_audit_log_old_style_user_id
+          "SET audit.user_unique_name = '#{PGconn.escape_bytea(username)}';"
+        else
+          "CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_unique_name() RETURNS varchar AS $_$ SELECT '#{PGconn.escape_bytea(username)}'::varchar $_$ LANGUAGE SQL STABLE;"
+        end
       end
 
       def install
@@ -47,11 +59,11 @@ module PgAuditLog
               unique_name varchar;
               column_name varchar;
             BEGIN
-              user_identifier := pg_temp.pg_audit_log_user_identifier();
+              user_identifier := #{pg_audit_log_old_style_user_id ? "current_setting('audit.user_id')" : '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();
+              unique_name := #{pg_audit_log_old_style_user_id ? "current_setting('audit.user_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

data/lib/pg_audit_log/version.rb

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

data/spec/function_spec.rb

@@ -22,8 +22,28 @@ describe PgAuditLog::Function do
     subject { PgAuditLog::Function.user_unique_name_temporary_function(email) }
     let(:email) { "o'connell@fred.com" }
 
-    it "escapes the email" do
-      subject.should match("'o''connell@fred.com'::varchar")
+    context "new style" do
+      it "escapes the email" do
+        subject.should_not match("SET")
+
+        subject.should match("FUNCTION")
+        subject.should match("'o''connell@fred.com'::varchar")
+      end
+    end
+
+    context "old style" do
+      before do
+        Rails = double
+        Rails.stub_chain(:configuration, :pg_audit_log_old_style_user_id).and_return(true)
+      end
+      after { Object.send(:remove_const, :Rails) }
+      it "escapes the email" do
+        subject.should match("SET")
+        subject.should match("'o''connell@fred.com'")
+
+        subject.should_not match("FUNCTION")
+        subject.should_not match("'o''connell@fred.com'::varchar")
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_audit_log
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3807464180291971898
+      hash: 4555192677821680411
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3807464180291971898
+      hash: 4555192677821680411
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.19