From 8fbe70729da1d308a118c930e8f938837484a61c Mon Sep 17 00:00:00 2001
From: Azul <azul@riseup.net>
Date: Fri, 12 Aug 2016 17:26:51 +0200
Subject: [db] def database on users instead of use_database

use_database affects all uses of prepare_database - so also the one
in tmp_database. In order to avoid that we do not use_database but
just overwrite the database method itself.
---
 lib/temporary_user.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/temporary_user.rb b/lib/temporary_user.rb
index e41add5..d0db1c4 100644
--- a/lib/temporary_user.rb
+++ b/lib/temporary_user.rb
@@ -13,6 +13,7 @@
 module TemporaryUser
   extend ActiveSupport::Concern
 
+  USER_DB = 'users'
   TMP_USER_DB = 'tmp_users'
   TMP_LOGIN   = 'tmp_user'  # created and deleted frequently
   TEST_LOGIN  = 'test_user' # created, rarely deleted
@@ -38,12 +39,15 @@ module TemporaryUser
     end
     alias :find :get
 
-    # calls db_name(TMP_LOGIN), then creates a CouchRest::Database
-    # from the name
+    def database
+      @database ||= prepare_database USER_DB
+    end
+
     def tmp_database
       @tmp_database ||= prepare_database TMP_USER_DB
     end
 
+
     # create the tmp db if it doesn't exist.
     # requires admin access.
     def create_tmp_database!
-- 
cgit v1.2.3