From 1e22db4fb2ca685743fb820d7071d088cd957fc8 Mon Sep 17 00:00:00 2001 From: Jan Orel Date: Thu, 13 Aug 2020 11:58:29 +0200 Subject: [PATCH] B #5025: Use userset collumn name (#151) --- src/sql/OneDB.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sql/OneDB.cc b/src/sql/OneDB.cc index 65ecc884b2..5b1421b15b 100644 --- a/src/sql/OneDB.cc +++ b/src/sql/OneDB.cc @@ -145,11 +145,11 @@ namespace one_db /* ---------------------------------------------------------------------- */ const char * acl_table = "acl"; - const char * acl_db_names = "oid, user_oid, resource, rights, zone"; + const char * acl_db_names = "oid, userset, resource, rights, zone"; const char * acl_db_bootstrap = "CREATE TABLE IF NOT EXISTS " - "acl (oid INT PRIMARY KEY, user_oid BIGINT, resource BIGINT, " - "rights BIGINT, zone BIGINT, UNIQUE(user_oid, resource, rights, zone))"; + "acl (oid INT PRIMARY KEY, userset BIGINT, resource BIGINT, " + "rights BIGINT, zone BIGINT, UNIQUE(userset, resource, rights, zone))"; /* ---------------------------------------------------------------------- */ /* Datastore tables */