From b77e1ae6f78461a1721150538158480d99bd899b Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@gitlab.com>
Date: Fri, 15 May 2015 14:34:22 +0200
Subject: Don't require DB conncetion in AttrEncrypted.

---
 .../attr_encrypted_no_db_connection.rb             | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 config/initializers/attr_encrypted_no_db_connection.rb

diff --git a/config/initializers/attr_encrypted_no_db_connection.rb b/config/initializers/attr_encrypted_no_db_connection.rb
new file mode 100644
index 00000000000..72e257a013e
--- /dev/null
+++ b/config/initializers/attr_encrypted_no_db_connection.rb
@@ -0,0 +1,29 @@
+module AttrEncrypted
+  module Adapters
+    module ActiveRecord
+      protected
+
+      def attribute_instance_methods_as_symbols
+        # We add accessor methods of the db columns to the list of instance
+        # methods returned to let ActiveRecord define the accessor methods
+        # for the db columns
+        if connection_established? && table_exists?
+          columns_hash.keys.inject(super) {|instance_methods, column_name| instance_methods.concat [column_name.to_sym, :"#{column_name}="]}
+        else
+          super
+        end
+      end
+
+      def connection_established?
+        begin
+          # use with_connection so the connection doesn't stay pinned to the thread.
+          ActiveRecord::Base.connection_pool.with_connection {
+            ActiveRecord::Base.connection.active?
+          }
+        rescue Exception
+          false
+        end
+      end
+    end
+  end
+end
-- 
cgit v1.2.1