Skip to content

fix: renames addRoleToPermission function #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 14, 2022
Merged

fix: renames addRoleToPermission function #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/io/supertokens/storage/postgresql/Start.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/io/supertokens/storage/postgresql/queries/UserRolesQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand All @@ -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 {
Expand Down