pg_audit_log 0.5.0 → 0.5.1

data/lib/pg_audit_log/active_record.rb

@@ -8,7 +8,7 @@ module PgAuditLog
       end
 
       def execute(sql)
-        connection.execute_without_auditing(sql)
+        connection.execute(sql)
       end
     end
   end

data/lib/pg_audit_log/entry.rb

@@ -75,7 +75,7 @@ class PgAuditLog::Entry < ActiveRecord::Base
           BEFORE INSERT ON audit_log
           FOR EACH ROW EXECUTE PROCEDURE audit_log_insert_trigger();
       SQL
-      connection.execute_without_auditing(sql)
+      connection.execute(sql)
     end
 
     def uninstall

data/lib/pg_audit_log/extensions/{shared/postgresql_adapter.rb → postgresql_adapter.rb}

@@ -2,30 +2,6 @@ require "active_record/connection_adapters/postgresql_adapter"
 
 # Did not want to reopen the class but sending an include seemingly is not working.
 class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  def begin_db_transaction
-    execute_without_auditing "BEGIN"
-  end
-
-  def commit_db_transaction
-    execute_without_auditing "COMMIT"
-  end
-
-  def rollback_db_transaction
-    execute_without_auditing "ROLLBACK"
-  end
-
-  def create_savepoint
-    execute_without_auditing("SAVEPOINT #{current_savepoint_name}")
-  end
-
-  def rollback_to_savepoint
-    execute_without_auditing("ROLLBACK TO SAVEPOINT #{current_savepoint_name}")
-  end
-
-  def release_savepoint
-    execute_without_auditing("RELEASE SAVEPOINT #{current_savepoint_name}")
-  end
-
   def drop_table_with_auditing(table_name, options = {})
     if PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
       PgAuditLog::Triggers.drop_for_table(table_name)
@@ -49,17 +25,55 @@ class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
   alias_method_chain :create_table, :auditing
 
   def rename_table_with_auditing(table_name, new_name)
-    rename_table_without_auditing(table_name, new_name)
     if PgAuditLog::Triggers.tables_with_triggers.include?(table_name)
       PgAuditLog::Triggers.drop_for_table(table_name)
     end
-    unless PgAuditLog::IGNORED_TABLES.include?(table_name) ||
-      PgAuditLog::Triggers.tables_with_triggers.include?(new_name)
+    rename_table_without_auditing(table_name, new_name)
+    unless PgAuditLog::IGNORED_TABLES.include?(table_name) || PgAuditLog::Triggers.tables_with_triggers.include?(new_name)
       PgAuditLog::Triggers.create_for_table(new_name)
     end
   end
   alias_method_chain :rename_table, :auditing
 
+  def set_audit_user_id_and_name
+    user_id, unique_name = user_id_and_name
+    return true if (@last_user_id && @last_user_id == user_id) && (@last_unique_name && @last_unique_name == unique_name)
+
+    execute_without_pg_audit_log PgAuditLog::Function::user_identifier_temporary_function(user_id)
+    execute_without_pg_audit_log PgAuditLog::Function::user_unique_name_temporary_function(unique_name)
+    @last_user_id = user_id
+    @last_unique_name = unique_name
+
+    true
+  end
+
+  def blank_audit_user_id_and_name
+    @last_user_id = @last_unique_name = nil
+    true
+  end
+
+  def reconnect_with_pg_audit_log!
+    reconnect_without_pg_audit_log!
+    @last_user_id = @last_unique_name = nil
+  end
+  alias_method_chain :reconnect!, :pg_audit_log
+
+  def execute_with_pg_audit_log(sql, name = nil)
+    conn = execute_without_pg_audit_log(sql, name = nil)
+    set_audit_user_id_and_name
+    conn
+  end
+  alias_method_chain :execute, :pg_audit_log
+
+  if ::ActiveRecord::VERSION::MAJOR >= 3 && ::ActiveRecord::VERSION::MINOR >= 1
+    def exec_query_with_pg_audit_log(sql, name = 'SQL', binds = [])
+      conn = exec_query_without_pg_audit_log(sql, name, binds)
+      set_audit_user_id_and_name
+      conn
+    end
+    alias_method_chain :exec_query, :pg_audit_log
+  end
+
   private
 
   def user_id_and_name

data/lib/pg_audit_log/function.rb

@@ -22,29 +22,11 @@ module PgAuditLog
       end
 
       def user_identifier_temporary_function(user_id)
-        sql = <<-SQL
-          CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_identifier() RETURNS integer
-          LANGUAGE plpgsql
-          AS $_$
-            BEGIN
-              RETURN #{user_id};
-            END
-            $_$;
-        SQL
-        sql.split("\n").join(" ")
+        "CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_identifier() RETURNS integer AS 'SELECT #{user_id}' LANGUAGE SQL STABLE;"
       end
 
       def user_unique_name_temporary_function(username)
-        sql = <<-SQL
-          CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_unique_name() RETURNS varchar
-          LANGUAGE plpgsql
-          AS $_$
-            BEGIN
-              RETURN '#{username}';
-            END
-            $_$;
-        SQL
-        sql.split("\n").join(" ")
+        "CREATE OR REPLACE FUNCTION pg_temp.pg_audit_log_user_unique_name() RETURNS varchar AS $_$ SELECT '#{username}'::varchar $_$ LANGUAGE SQL STABLE;"
       end
 
       def install

data/lib/pg_audit_log/version.rb

@@ -1,3 +1,3 @@
 module PgAuditLog
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/pg_audit_log.rb

@@ -5,17 +5,9 @@ end
 require "active_record"
 require "pg_audit_log/version"
 
-case ::ActiveRecord::VERSION::MAJOR
-when 3
-  require "pg_audit_log/extensions/shared/postgresql_adapter.rb"
-  if ::ActiveRecord::VERSION::MINOR == 0
-    require "pg_audit_log/extensions/3.0/postgresql_adapter.rb"
-  else
-    require "pg_audit_log/extensions/3.1/postgresql_adapter.rb"
-  end
-else
-  raise "ActiveRecord #{::ActiveRecord::VERSION::MAJOR}.x unsupported!"
-end
+raise "ActiveRecord #{::ActiveRecord::VERSION::MAJOR}.x unsupported!" unless ::ActiveRecord::VERSION::MAJOR == 3
+
+require "pg_audit_log/extensions/postgresql_adapter.rb"
 require "pg_audit_log/active_record"
 require "pg_audit_log/entry"
 require "pg_audit_log/function"

data/spec/pg_audit_log_spec.rb

@@ -265,12 +265,23 @@ describe PgAuditLog do
     end
 
     describe "when renaming the table" do
+      def trigger_names
+        connection.select_values <<-SQL
+          SELECT triggers.tgname as trigger_name
+          FROM pg_trigger triggers
+          WHERE triggers.tgname LIKE '#{PgAuditLog::Triggers.trigger_prefix}%'
+        SQL
+      end
+
       it "should automatically drop and create the trigger" do
         new_table_name = "new_table_#{Time.now.to_i}"
         connection.create_table("test_table")
         connection.rename_table("test_table", new_table_name)
-        PgAuditLog::Triggers.tables_with_triggers.should_not include("test_table")
+
+        trigger_names.should_not include("audit_test_table")
+        trigger_names.should include("audit_#{new_table_name}")
         PgAuditLog::Triggers.tables_with_triggers.should include(new_table_name)
+
         connection.drop_table(new_table_name) rescue nil
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg_audit_log
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-09 00:00:00.000000000 Z
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70242168359480 !ruby/object:Gem::Requirement
+  requirement: &70263689333140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70242168359480
+  version_requirements: *70263689333140
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70242168358980 !ruby/object:Gem::Requirement
+  requirement: &70263689332640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.0
   type: :runtime
   prerelease: false
-  version_requirements: *70242168358980
+  version_requirements: *70263689332640
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70242168358520 !ruby/object:Gem::Requirement
+  requirement: &70263689332180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70242168358520
+  version_requirements: *70263689332180
 - !ruby/object:Gem::Dependency
   name: with_model
-  requirement: &70242168358060 !ruby/object:Gem::Requirement
+  requirement: &70263689331720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70242168358060
+  version_requirements: *70263689331720
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &70242168357680 !ruby/object:Gem::Requirement
+  requirement: &70263689331340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242168357680
+  version_requirements: *70263689331340
 description: 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
@@ -92,15 +92,12 @@ files:
 - lib/pg_audit_log.rb
 - lib/pg_audit_log/active_record.rb
 - lib/pg_audit_log/entry.rb
-- lib/pg_audit_log/extensions/3.0/postgresql_adapter.rb
-- lib/pg_audit_log/extensions/3.1/postgresql_adapter.rb
-- lib/pg_audit_log/extensions/shared/postgresql_adapter.rb
+- lib/pg_audit_log/extensions/postgresql_adapter.rb
 - lib/pg_audit_log/function.rb
 - lib/pg_audit_log/triggers.rb
 - lib/pg_audit_log/version.rb
 - pg_audit_log.gemspec
 - spec/configuration_spec.rb
-- spec/connection_adapter_spec.rb
 - spec/function_spec.rb
 - spec/model_spec.rb
 - spec/pg_audit_log_spec.rb
@@ -120,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1658347057273507033
+      hash: -372258529913880576
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -129,16 +126,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1658347057273507033
+      hash: -372258529913880576
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: postgresql only database-level audit logging of all databases changes
 test_files:
 - spec/configuration_spec.rb
-- spec/connection_adapter_spec.rb
 - spec/function_spec.rb
 - spec/model_spec.rb
 - spec/pg_audit_log_spec.rb

data/lib/pg_audit_log/extensions/3.0/postgresql_adapter.rb

@@ -1,26 +0,0 @@
-require "active_record/connection_adapters/postgresql_adapter"
-
-# Did not want to reopen the class but sending an include seemingly is not working.
-class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  def execute_with_auditing(sql, name = nil)
-    user_id, unique_name = user_id_and_name
-    log_user_id = PgAuditLog::Function.user_identifier_temporary_function(user_id)
-    log_user_unique_name = PgAuditLog::Function.user_unique_name_temporary_function(unique_name)
-
-    logged_sql = ENV["LOG_AUDIT_SQL"] ? [log_user_id, log_user_unique_name, sql].values.join('; ') : sql
-    log(logged_sql, name) do
-      if @async
-        @connection.async_exec(log_user_id)
-        @connection.async_exec(log_user_unique_name)
-        @connection.async_exec(sql)
-      else
-        @connection.exec(log_user_id)
-        @connection.exec(log_user_unique_name)
-        @connection.exec(sql)
-      end
-    end
-  end
-
-  alias_method_chain :execute, :auditing
-end
-

data/lib/pg_audit_log/extensions/3.1/postgresql_adapter.rb

@@ -1,35 +0,0 @@
-require "active_record/connection_adapters/postgresql_adapter"
-
-# Did not want to reopen the class but sending an include seemingly is not working.
-class ActiveRecord::ConnectionAdapters::PostgreSQLAdapter
-  def generate_auditing_sql(sql)
-    user_id, unique_name = user_id_and_name
-    log_user_id = PgAuditLog::Function.user_identifier_temporary_function(user_id)
-    log_user_unique_name = PgAuditLog::Function.user_unique_name_temporary_function(unique_name)
-    { :user_id => log_user_id, :unique_name => log_user_unique_name, :sql => sql }
-  end
-
-  def exec_query_with_auditing(sql, name = 'SQL', binds = [])
-    audited_sql = generate_auditing_sql(sql)
-    logged_sql = ENV["LOG_AUDIT_SQL"] ? audited_sql.values.join('; ') : sql
-    log(logged_sql, name, binds) do
-      exec_no_cache(audited_sql[:user_id], binds)
-      exec_no_cache(audited_sql[:unique_name], binds)
-      result = binds.empty? ? exec_no_cache(sql, binds) :
-                              exec_cache(sql, binds)
-
-      ret = ActiveRecord::Result.new(result.fields, result_as_array(result))
-      result.clear
-      return ret
-    end
-  end
-  alias_method_chain :exec_query, :auditing
-
-  def execute_with_auditing(sql, name = nil)
-    log(generate_auditing_sql(sql), name) do
-      @connection.async_exec(sql)
-    end
-  end
-  alias_method_chain :execute, :auditing
-end
-

data/spec/connection_adapter_spec.rb

@@ -1,13 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-
-describe "the connection adapter" do
-  subject { ActiveRecord::Base.connection }
-
-  it { should respond_to(:execute_without_auditing) }
-
-  it "should work for both execute and execute_without_auditing" do
-    subject.execute("SELECT 1 = 1")
-    subject.execute_without_auditing("SELECT 1 = 1")
-  end
-
-end