summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAzul <azul@riseup.net>2016-08-12 17:26:51 +0200
committerAzul <azul@riseup.net>2016-08-12 17:26:51 +0200
commit8fbe70729da1d308a118c930e8f938837484a61c (patch)
tree06b34c69cc535dce9c2786f7172a5ab1bb60e7e0 /lib
parent8196f46b2c4d1d0dce7e4eafcc299879ec0d894b (diff)
[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.
Diffstat (limited to 'lib')
-rw-r--r--lib/temporary_user.rb8
1 files changed, 6 insertions, 2 deletions
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!