fix PK query

Author: singhpk234

persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java

@@ -224,7 +224,6 @@ public void runWithinTransaction(TransactionCallback callback) throws SQLExcepti
 
   public Integer execute(Connection connection, PreparedQuery preparedQuery) throws SQLException {
     try (PreparedStatement statement = connection.prepareStatement(preparedQuery.sql())) {
-      System.out.println(preparedQuery.sql());
       List<Object> params = preparedQuery.parameters();
       for (int i = 0; i < params.size(); i++) {
         statement.setObject(i + 1, params.get(i));

persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java

@@ -465,7 +465,8 @@ public PolarisGrantRecord lookupGrantRecord(
       int privilegeCode) {
     try {
       List<Object> params =
-          List.of(securableCatalogId, securableId, granteeCatalogId, privilegeCode, realmId);
+          List.of(
+              realmId, securableCatalogId, securableId, granteeCatalogId, granteeId, privilegeCode);
       var results =
           datasourceOperations.executeSelect(
               new PreparedQuery(SQLConstants.GRANT_RECORD_LOOKUP_BY_PK_QUERY, params),

persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/SQLConstants.java

@@ -154,7 +154,9 @@ public class SQLConstants {
           + SCHEMA
           + "."
           + ModelGrantRecord.TABLE_NAME
-          + " WHERE securable_catalog_id = ? AND securable_id = ? AND grantee_catalog_id = ? AND privilege_code = ? AND realm_id = ?";
+          + " WHERE "
+          + String.join(" = ? AND ", ModelGrantRecord.PK_COLUMNS)
+          + " = ?";
 
   public static final String GRANT_RECORD_LOOKUP_BY_SECURABLE_QUERY =
       "SELECT "