From 4c94941838f8b86f02a5b583b77144cb9137998a Mon Sep 17 00:00:00 2001 From: jscyo Date: Thu, 14 Apr 2022 13:58:53 +0530 Subject: [PATCH] fix: renames addRoleToPermission function --- src/main/java/io/supertokens/storage/postgresql/Start.java | 6 +++--- .../storage/postgresql/queries/UserRolesQueries.java | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/io/supertokens/storage/postgresql/Start.java b/src/main/java/io/supertokens/storage/postgresql/Start.java index fe2da849..39a7d6b8 100644 --- a/src/main/java/io/supertokens/storage/postgresql/Start.java +++ b/src/main/java/io/supertokens/storage/postgresql/Start.java @@ -1534,11 +1534,11 @@ public void createNewRoleOrDoNothingIfExists_Transaction(TransactionConnection c } @Override - public void addPermissionToRole_Transaction(TransactionConnection con, String role, String permission) - throws StorageQueryException, UnknownRoleException { + public void addPermissionToRoleOrDoNothingIfExists_Transaction(TransactionConnection con, String role, + String permission) throws StorageQueryException, UnknownRoleException { Connection sqlCon = (Connection) con.getConnection(); try { - UserRolesQueries.addPermissionToRole_Transaction(this, sqlCon, role, permission); + UserRolesQueries.addPermissionToRoleOrDoNothingIfExists_Transaction(this, sqlCon, role, permission); } catch (SQLException e) { if (e instanceof PSQLException) { PostgreSQLConfig config = Config.getConfig(this); diff --git a/src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java b/src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java index 956327cf..8c5e2b75 100644 --- a/src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java +++ b/src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java @@ -88,8 +88,8 @@ public static void createNewRole_Transaction(Start start, Connection con, String update(con, QUERY, pst -> pst.setString(1, role)); } - public static void addPermissionToRole_Transaction(Start start, Connection con, String role, String permission) - throws SQLException, StorageQueryException { + public static void addPermissionToRoleOrDoNothingIfExists_Transaction(Start start, Connection con, String role, + String permission) throws SQLException, StorageQueryException { String QUERY = "INSERT INTO " + getConfig(start).getUserRolesPermissionsTable() + " (role, permission) VALUES(?, ?) ON CONFLICT DO NOTHING"; @@ -109,7 +109,6 @@ public static boolean deleteRole(Start start, String role) throws SQLException, public static boolean doesRoleExist(Start start, String role) throws SQLException, StorageQueryException { String QUERY = "SELECT 1 FROM " + getConfig(start).getRolesTable() + " WHERE role = ?"; return execute(start, QUERY, pst -> pst.setString(1, role), ResultSet::next); - } public static String[] getPermissionsForRole(Start start, String role) throws SQLException, StorageQueryException {