You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polaris.apache.org by ad...@apache.org on 2026/09/30 12:06:55 UTC

(polaris) branch main updated: JDBC: Use single DDL init script (#5349)

This is an automated email from the ASF dual-hosted git repository.

adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git


The following commit(s) were added to refs/heads/main by this push:
     new 6d0839b1fe JDBC: Use single DDL init script (#5349)
6d0839b1fe is described below

commit 6d0839b1fed973d949a25c9489ddae2db18713dc
Author: Alexandre Dutra <ad...@apache.org>
AuthorDate: Wed Sep 30 14:06:50 2026 +0200

    JDBC: Use single DDL init script (#5349)
    
    Per-database-type DDL scripts (`schema-v1.sql` through `schema-v6.sql`)
    are replaced by a single `schema.sql` per database type. Bootstrap always
    runs this script idempotently (`CREATE TABLE IF NOT EXISTS` /
    `CREATE INDEX IF NOT EXISTS`), so there is no longer any need for
    version-aware fallback logic at runtime.
    
    The runtime fallback, `SchemaVersion`, `SchemaOptions`, `SchemaVersions`,
    and `JdbcBootstrapUtils` are removed. In their place, a fail-fast
    `validateSchemaCompatibility()` check reads `POLARIS_SCHEMA.VERSION` at
    startup and throws an actionable `IllegalStateException` if the recorded
    version does not match `CURRENT_SCHEMA_VERSION`, rather than silently
    degrading.
    
    The relational-jdbc documentation is revamped and now displays a full
    schema-version history table.
---
 CHANGELOG.md                                       |  11 +
 .../metrics/jdbc/JdbcMetricsPersistenceTest.java   |   4 +-
 .../persistence/relational/jdbc/DatabaseType.java  |  34 +--
 .../relational/jdbc/DatasourceOperations.java      |  60 ++++
 .../relational/jdbc/JdbcBasePersistenceImpl.java   |  89 ++----
 .../relational/jdbc/JdbcBootstrapUtils.java        | 101 -------
 .../jdbc/JdbcMetaStoreManagerFactory.java          |  73 ++---
 .../relational/jdbc/QueryGenerator.java            |  29 +-
 .../relational/jdbc/models/ModelEntity.java        |  54 +---
 .../relational/jdbc/models/ModelEvent.java         |  21 +-
 .../relational/jdbc/models/SchemaVersion.java      |  56 ----
 .../src/main/resources/cockroachdb/schema-v4.sql   | 308 ---------------------
 .../src/main/resources/cockroachdb/schema-v6.sql   | 288 -------------------
 .../cockroachdb/{schema-v5.sql => schema.sql}      |  32 +--
 .../src/main/resources/h2/schema-v1.sql            | 120 --------
 .../src/main/resources/h2/schema-v2.sql            | 127 ---------
 .../src/main/resources/h2/schema-v3.sql            | 136 ---------
 .../src/main/resources/h2/schema-v4.sql            | 299 --------------------
 .../src/main/resources/h2/schema-v5.sql            | 272 ------------------
 .../resources/h2/{schema-v6.sql => schema.sql}     |  11 +-
 .../src/main/resources/postgres/schema-v1.sql      | 116 --------
 .../src/main/resources/postgres/schema-v2.sql      | 124 ---------
 .../src/main/resources/postgres/schema-v3.sql      | 136 ---------
 .../src/main/resources/postgres/schema-v4.sql      | 301 --------------------
 .../src/main/resources/postgres/schema-v6.sql      | 272 ------------------
 .../postgres/{schema-v5.sql => schema.sql}         |  19 +-
 ...ithJdbcBasePersistenceImplPostgresSchemaIT.java |  25 +-
 ...toreManagerWithJdbcBasePersistenceImplTest.java |  30 +-
 .../jdbc/DatasourceOperationsSchemaTest.java       |  85 +++++-
 .../relational/jdbc/DatasourceOperationsTest.java  |   8 +-
 .../jdbc/JdbcBasePersistenceImplTest.java          | 143 ++++------
 .../relational/jdbc/JdbcBootstrapUtilsTest.java    | 179 ------------
 .../relational/jdbc/JdbcEventsPersistenceTest.java |  36 +--
 .../relational/jdbc/QueryGeneratorTest.java        |  74 +++--
 .../relational/jdbc/SchemaVersions.java            |  82 ------
 .../relational/jdbc/models/ModelEventTest.java     |  28 +-
 .../src/test/resources/h2/schema-v0.sql            | 109 --------
 .../core/config/BehaviorChangeConfiguration.java   |  10 -
 .../persistence/bootstrap/BootstrapOptions.java    |   2 -
 .../core/persistence/bootstrap/SchemaOptions.java  |  28 --
 .../apache/polaris/admintool/BootstrapCommand.java |   2 -
 ...InMemoryBufferEventListenerIntegrationTest.java |   5 +-
 .../InMemoryBufferEventListenerTestBase.java       |   4 +-
 .../flags-polaris_behavior_changes.md              |   9 -
 .../unreleased/metastores/relational-jdbc.md       | 214 +++++++++++---
 45 files changed, 520 insertions(+), 3646 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30e325fa89..f3b4e1e23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,12 @@ request adding CHANGELOG notes for breaking (!) changes and possibly other secti
     WHERE location_without_scheme IS NOT NULL;
   ```
   H2 is unaffected.
+- Relational JDBC: The per-schema-version runtime fallback has been removed. The migration to schema
+  v6 is now **required** before starting this version of Polaris. The first request to any realm
+  whose recorded schema version does not match what the binary expects will fail fast with a clear
+  error message. See the [Relational JDBC metastore documentation] for the full upgrade path.
+
+[Relational JDBC metastore documentation]:https://polaris.apache.org/releases/latest/metastores/relational-jdbc/#schema-upgrades
 
 - Relational JDBC: schema version 6 also declares `idx_grants_realm_grantee`,
   `idx_grants_realm_securable` and `idx_entities_catalog_id_id` on CockroachDB (see Fixes), which
@@ -101,6 +107,11 @@ request adding CHANGELOG notes for breaking (!) changes and possibly other secti
 - The `PolarisPrincipal` interface has evolved. The `getAttributes()` method now returns 
   `org.apache.polaris.core.collection.ImmutableAttributeMap`. The attribute keys were moved to a
   new `org.apache.polaris.core.auth.PolarisPrincipalAttributes` class.
+- Relational JDBC: Per-version schema scripts (`schema-v1.sql` through `schema-v5.sql`) have been
+  replaced by a single `schema.sql` that is safe to run on every startup. Per-version runtime
+  compatibility fallbacks and the `SCHEMA_VERSION_FALL_BACK_ON_DNE` configuration key have been
+  removed. Operators must ensure their database is at the right schema version before upgrading to 
+  this version.
 
 ### New Features
 
diff --git a/extensions/metrics-reports/persistence/relational-jdbc/src/test/java/org/apache/polaris/extension/metrics/jdbc/JdbcMetricsPersistenceTest.java b/extensions/metrics-reports/persistence/relational-jdbc/src/test/java/org/apache/polaris/extension/metrics/jdbc/JdbcMetricsPersistenceTest.java
index b38ad4aa2b..aff8093fbb 100644
--- a/extensions/metrics-reports/persistence/relational-jdbc/src/test/java/org/apache/polaris/extension/metrics/jdbc/JdbcMetricsPersistenceTest.java
+++ b/extensions/metrics-reports/persistence/relational-jdbc/src/test/java/org/apache/polaris/extension/metrics/jdbc/JdbcMetricsPersistenceTest.java
@@ -50,9 +50,9 @@ class JdbcMetricsPersistenceTest {
     DatasourceOperations datasourceOperations =
         new DatasourceOperations(dataSource, new TestJdbcConfiguration());
 
-    // Execute main schema v4 (includes metrics tables)
+    // Execute schema script (includes metrics tables)
     ClassLoader classLoader = DatasourceOperations.class.getClassLoader();
-    InputStream schemaStream = classLoader.getResourceAsStream("h2/schema-v5.sql");
+    InputStream schemaStream = classLoader.getResourceAsStream("h2/schema.sql");
     datasourceOperations.executeScript(schemaStream);
 
     RealmContext realmContext = () -> "TEST_REALM";
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatabaseType.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatabaseType.java
index 3918f2f8ad..1948006244 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatabaseType.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatabaseType.java
@@ -47,18 +47,6 @@ public enum DatabaseType {
     return displayName;
   }
 
-  /**
-   * Returns the latest schema version available for this database type. This is used as the default
-   * schema version for new installations.
-   */
-  public int getLatestSchemaVersion() {
-    return switch (this) {
-      case POSTGRES -> 6; // PostgreSQL has schemas v1, v2, v3, v4, v5, v6
-      case COCKROACHDB -> 6; // CockroachDB schema version kept in sync with PostgreSQL
-      case H2 -> 6; // H2 uses same schemas as PostgreSQL
-    };
-  }
-
   public static DatabaseType fromDisplayName(String displayName) {
     return switch (displayName.toLowerCase(Locale.ROOT)) {
       case "h2" -> DatabaseType.H2;
@@ -145,29 +133,17 @@ public enum DatabaseType {
   }
 
   /**
-   * Open an InputStream that contains data from an init script. This stream should be closed by the
-   * caller.
+   * Open an InputStream that contains data from the init script. This stream should be closed by
+   * the caller.
    */
-  public InputStream openInitScriptResource(int schemaVersion) {
-    // Validate schema version is within acceptable range for this database type
-    int latestVersion = getLatestSchemaVersion();
-    if (schemaVersion <= 0 || schemaVersion > latestVersion) {
-      throw new IllegalArgumentException(
-          String.format(
-              "Invalid schema version %d for database type %s. Valid range: 1-%d",
-              schemaVersion, this, latestVersion));
-    }
-
-    final String resourceName =
-        String.format("%s/schema-v%d.sql", this.getDisplayName(), schemaVersion);
+  public InputStream openInitScriptResource() {
+    final String resourceName = String.format("%s/schema.sql", this.getDisplayName());
 
     ClassLoader classLoader = DatasourceOperations.class.getClassLoader();
     InputStream stream = classLoader.getResourceAsStream(resourceName);
     if (stream == null) {
       throw new IllegalStateException(
-          String.format(
-              "Schema resource not found: %s (database type: %s, version: %d)",
-              resourceName, this, schemaVersion));
+          String.format("Schema resource not found: %s (database type: %s)", resourceName, this));
     }
     return stream;
   }
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java
index 9b3db83610..25f88a6f84 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperations.java
@@ -33,6 +33,7 @@ import java.sql.Statement;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Random;
 import java.util.concurrent.TimeUnit;
@@ -54,6 +55,15 @@ public class DatasourceOperations {
 
   private static final Logger LOGGER = LoggerFactory.getLogger(DatasourceOperations.class);
 
+  /** The schema version this binary expects to find in the version table. */
+  // Whenever a schema change requires a migration:
+  // 1) Increment the version number in all schema.sql scripts
+  //    (the version number MUST be the same on all scripts)
+  // 2) Increment this constant to match the version number in schema.sql
+  // 3) Add the corresponding migration SQL to the Relational JDBC metastore documentation
+  // 4) Add a note to the changelog
+  public static final int CURRENT_SCHEMA_VERSION = 6;
+
   // PG STATUS CODES
   // 23505 = unique key violation, consistent across PG/Cockroach/H2; other checks (FK, NOT NULL,
   // CHECK) all propagate
@@ -460,6 +470,56 @@ public class DatasourceOperations {
     return UNIQUENESS_CONSTRAINT_VIOLATION_SQL_CODE.equals(e.getSQLState());
   }
 
+  /**
+   * Checks whether the version table reports the schema version this binary expects. Throws {@link
+   * IllegalStateException} on a mismatch, an absent version table, or an empty version table.
+   */
+  public void validateSchemaCompatibility() {
+    PreparedQuery query = QueryGenerator.generateVersionQuery();
+    try {
+      List<Integer> versions =
+          executeSelect(
+              query,
+              new Converter<>() {
+                @Override
+                public Integer fromResultSet(ResultSet rs) throws SQLException {
+                  return rs.getInt("version_value");
+                }
+
+                @Override
+                public Map<String, Object> toMap(DatabaseType databaseType) {
+                  return Map.of();
+                }
+              });
+      if (versions.isEmpty()) {
+        throw new IllegalStateException(
+            "Version table exists but contains no rows. "
+                + "The database may be in a corrupted state. "
+                + "See the Relational JDBC metastore documentation for upgrade instructions.");
+      }
+      int version = versions.getFirst();
+      if (version != CURRENT_SCHEMA_VERSION) {
+        throw new IllegalStateException(
+            String.format(
+                "Incompatible JDBC schema version %d (expected %d). "
+                    + "Please apply the required DDL migration before starting Polaris. "
+                    + "See the Relational JDBC metastore documentation for upgrade instructions.",
+                version, CURRENT_SCHEMA_VERSION));
+      }
+    } catch (SQLException e) {
+      if (isRelationDoesNotExist(e)) {
+        throw new IllegalStateException(
+            "Version table not found. "
+                + "Please run the bootstrap command before starting Polaris, "
+                + "or apply the required DDL migration. "
+                + "See the Relational JDBC metastore documentation for upgrade instructions.",
+            e);
+      }
+      throw new IllegalStateException(
+          "Could not validate JDBC schema compatibility: " + e.getMessage(), e);
+    }
+  }
+
   public boolean isRelationDoesNotExist(SQLException e) {
     return (RELATION_DOES_NOT_EXIST.equals(e.getSQLState())
             && (databaseType == DatabaseType.POSTGRES || databaseType == DatabaseType.COCKROACHDB))
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
index 0c96052116..af1d0511c9 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImpl.java
@@ -76,7 +76,6 @@ import org.apache.polaris.persistence.relational.jdbc.models.ModelEvent;
 import org.apache.polaris.persistence.relational.jdbc.models.ModelGrantRecord;
 import org.apache.polaris.persistence.relational.jdbc.models.ModelPolicyMappingRecord;
 import org.apache.polaris.persistence.relational.jdbc.models.ModelPrincipalAuthenticationData;
-import org.apache.polaris.persistence.relational.jdbc.models.SchemaVersion;
 import org.jspecify.annotations.NonNull;
 import org.jspecify.annotations.Nullable;
 import org.slf4j.Logger;
@@ -90,7 +89,6 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
   private final DatasourceOperations datasourceOperations;
   private final PrincipalSecretsGenerator secretsGenerator;
   private final String realmId;
-  private final int schemaVersion;
 
   // The max number of components a location can have before the optimized sibling check is not used
   private static final int MAX_LOCATION_COMPONENTS = 40;
@@ -114,13 +112,11 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
       PolarisDiagnostics diagnostics,
       DatasourceOperations databaseOperations,
       PrincipalSecretsGenerator secretsGenerator,
-      String realmId,
-      int schemaVersion) {
+      String realmId) {
     this.diagnostics = diagnostics;
     this.datasourceOperations = databaseOperations;
     this.secretsGenerator = secretsGenerator;
     this.realmId = realmId;
-    this.schemaVersion = schemaVersion;
   }
 
   @Override
@@ -187,9 +183,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
     datasourceOperations.executeSelectOverStream(
         connection,
         QueryGenerator.generateExistsQuery(
-            ModelEntity.getAllColumnNames(schemaVersion),
-            ModelEntity.TABLE_NAME,
-            entityKeyParams(entityId)),
+            ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, entityKeyParams(entityId)),
         ROW_EXISTS_CONVERTER,
         stream -> exists.set(stream.findAny().isPresent()));
     return exists.get();
@@ -202,7 +196,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
       Connection connection,
       QueryAction queryAction)
       throws SQLException {
-    ModelEntity modelEntity = ModelEntity.fromEntity(entity, schemaVersion);
+    ModelEntity modelEntity = ModelEntity.fromEntity(entity);
     if (originalEntity == null) {
       try {
         List<Object> values =
@@ -210,10 +204,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
         queryAction.apply(
             connection,
             QueryGenerator.generateInsertQuery(
-                ModelEntity.getAllColumnNames(schemaVersion),
-                ModelEntity.TABLE_NAME,
-                values,
-                realmId));
+                ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, values, realmId));
       } catch (SQLException e) {
         if (datasourceOperations.isUniquenessConstraintViolation(e)) {
           PolarisBaseEntity existingEntity =
@@ -261,10 +252,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
             queryAction.apply(
                 connection,
                 QueryGenerator.generateUpdateQuery(
-                    ModelEntity.getAllColumnNames(schemaVersion),
-                    ModelEntity.TABLE_NAME,
-                    values,
-                    params));
+                    ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, values, params));
         if (rowsUpdated == 0) {
           throw new RetryOnConcurrencyException(
               "Entity '%s' id '%s' concurrently modified; expected entity_version=%s, grant_records_version=%s",
@@ -312,7 +300,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
           QueryGenerator.generateInsertQuery(
               ModelEvent.ALL_COLUMNS,
               ModelEvent.TABLE_NAME,
-              ModelEvent.fromEvent(events.getFirst(), schemaVersion)
+              ModelEvent.fromEvent(events.getFirst())
                   .toMap(datasourceOperations.getDatabaseType())
                   .values()
                   .stream()
@@ -330,7 +318,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
             QueryGenerator.generateInsertQuery(
                 ModelEvent.ALL_COLUMNS,
                 ModelEvent.TABLE_NAME,
-                ModelEvent.fromEvent(event, schemaVersion)
+                ModelEvent.fromEvent(event)
                     .toMap(datasourceOperations.getDatabaseType())
                     .values()
                     .stream()
@@ -359,7 +347,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
 
   @Override
   public void deleteEntity(@NonNull PolarisCallContext callCtx, @NonNull PolarisBaseEntity entity) {
-    ModelEntity modelEntity = ModelEntity.fromEntity(entity, schemaVersion);
+    ModelEntity modelEntity = ModelEntity.fromEntity(entity);
     Map<String, Object> params =
         Map.of(
             "id",
@@ -371,7 +359,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
     try {
       datasourceOperations.executeUpdate(
           QueryGenerator.generateDeleteQuery(
-              ModelEntity.getAllColumnNames(schemaVersion), ModelEntity.TABLE_NAME, params));
+              ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, params));
     } catch (SQLException e) {
       throw new RuntimeException(
           String.format("Failed to delete entity due to %s", e.getMessage()), e);
@@ -419,7 +407,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
             datasourceOperations.execute(
                 connection,
                 QueryGenerator.generateDeleteQuery(
-                    ModelEntity.getAllColumnNames(schemaVersion), ModelEntity.TABLE_NAME, params));
+                    ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, params));
             datasourceOperations.execute(
                 connection,
                 QueryGenerator.generateDeleteQuery(
@@ -451,7 +439,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
         Map.of("catalog_id", catalogId, "id", entityId, "type_code", typeCode, "realm_id", realmId);
     return getPolarisBaseEntity(
         QueryGenerator.generateSelectQuery(
-            ModelEntity.getAllColumnNames(schemaVersion), ModelEntity.TABLE_NAME, params));
+            ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, params));
   }
 
   private Map<String, Object> entityKeyParams(long entityId) {
@@ -479,13 +467,13 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
             realmId);
     return getPolarisBaseEntity(
         QueryGenerator.generateSelectQuery(
-            ModelEntity.getAllColumnNames(schemaVersion), ModelEntity.TABLE_NAME, params));
+            ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, params));
   }
 
   @Nullable
   private PolarisBaseEntity getPolarisBaseEntity(QueryGenerator.PreparedQuery query) {
     try {
-      var results = datasourceOperations.executeSelect(query, new ModelEntity(schemaVersion));
+      var results = datasourceOperations.executeSelect(query, new ModelEntity());
       if (results.isEmpty()) {
         return null;
       } else if (results.size() > 1) {
@@ -507,11 +495,10 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
   public List<PolarisBaseEntity> lookupEntities(
       @NonNull PolarisCallContext callCtx, List<PolarisEntityId> entityIds) {
     if (entityIds == null || entityIds.isEmpty()) return new ArrayList<>();
-    PreparedQuery query =
-        QueryGenerator.generateSelectQueryWithEntityIds(realmId, schemaVersion, entityIds);
+    PreparedQuery query = QueryGenerator.generateSelectQueryWithEntityIds(realmId, entityIds);
     try {
       Map<PolarisEntityId, PolarisBaseEntity> idMap =
-          datasourceOperations.executeSelect(query, new ModelEntity(schemaVersion)).stream()
+          datasourceOperations.executeSelect(query, new ModelEntity()).stream()
               .collect(
                   Collectors.toMap(
                       e -> new PolarisEntityId(e.getCatalogId(), e.getId()), Function.identity()));
@@ -653,14 +640,14 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
               entityType,
               entitySubType,
               pageToken,
-              ModelEntity.getAllColumnNames(schemaVersion),
+              ModelEntity.getAllColumnNames(),
               // entityFilter is applied after the fetch, so a page size limit could under-fill a
               // page and drop its continuation token
               false);
       AtomicReference<Page<T>> results = new AtomicReference<>();
       datasourceOperations.executeSelectOverStream(
           query,
-          new ModelEntity(schemaVersion),
+          new ModelEntity(),
           stream -> {
             var data = stream.filter(entityFilter);
             results.set(Page.mapped(pageToken, data, transformer, EntityIdToken::fromEntity));
@@ -791,7 +778,7 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
       var results =
           datasourceOperations.executeSelect(
               QueryGenerator.generateExistsQuery(
-                  ModelEntity.getAllColumnNames(schemaVersion), ModelEntity.TABLE_NAME, params),
+                  ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, params),
               ROW_EXISTS_CONVERTER);
       return results != null && !results.isEmpty();
     } catch (SQLException e) {
@@ -802,47 +789,11 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
     }
   }
 
-  static int loadSchemaVersion(
-      DatasourceOperations datasourceOperations, boolean fallbackOnDoesNotExist) {
-    PreparedQuery query = QueryGenerator.generateVersionQuery();
-    try {
-      List<SchemaVersion> schemaVersion =
-          datasourceOperations.executeSelect(query, new SchemaVersion());
-      if (schemaVersion == null || schemaVersion.size() != 1) {
-        throw new RuntimeException("Failed to retrieve schema version");
-      }
-      return schemaVersion.getFirst().getValue();
-    } catch (SQLException e) {
-      if (fallbackOnDoesNotExist && datasourceOperations.isRelationDoesNotExist(e)) {
-        return SchemaVersion.MINIMUM.getValue();
-      }
-      LOGGER.error("Failed to load schema version due to {}", e.getMessage(), e);
-      throw new IllegalStateException("Failed to retrieve schema version", e);
-    }
-  }
-
-  static boolean entityTableExists(DatasourceOperations datasourceOperations) {
-    PreparedQuery query = QueryGenerator.generateEntityTableExistQuery();
-    try {
-      List<PolarisBaseEntity> entities =
-          datasourceOperations.executeSelect(query, new ModelEntity());
-      return entities != null && !entities.isEmpty();
-    } catch (SQLException e) {
-      if (datasourceOperations.isRelationDoesNotExist(e)) {
-        return false;
-      }
-      throw new IllegalStateException("Failed to check if Entities table exists", e);
-    }
-  }
-
   /** {@inheritDoc} */
   @Override
   public <T extends PolarisEntity & LocationBasedEntity>
       Optional<Optional<String>> hasOverlappingSiblings(
           @NonNull PolarisCallContext callContext, T entity) {
-    if (this.schemaVersion < 2) {
-      return Optional.empty();
-    }
     if (entity.getBaseLocation().chars().filter(ch -> ch == '/').count()
         > MAX_LOCATION_COMPONENTS) {
       return Optional.empty();
@@ -850,9 +801,9 @@ public class JdbcBasePersistenceImpl implements BasePersistence, IntegrationPers
 
     PreparedQuery query =
         QueryGenerator.generateOverlapQuery(
-            realmId, schemaVersion, entity.getCatalogId(), entity.getBaseLocation());
+            realmId, entity.getCatalogId(), entity.getBaseLocation());
     try {
-      var results = datasourceOperations.executeSelect(query, new ModelEntity(schemaVersion));
+      var results = datasourceOperations.executeSelect(query, new ModelEntity());
       if (!results.isEmpty()) {
         StorageLocation entityLocation = StorageLocation.of(entity.getBaseLocation());
         for (PolarisBaseEntity result : results) {
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBootstrapUtils.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBootstrapUtils.java
deleted file mode 100644
index 3e0391ca79..0000000000
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcBootstrapUtils.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.polaris.persistence.relational.jdbc;
-
-import java.util.Optional;
-import org.apache.polaris.core.persistence.bootstrap.BootstrapOptions;
-import org.apache.polaris.core.persistence.bootstrap.SchemaOptions;
-
-public class JdbcBootstrapUtils {
-
-  private JdbcBootstrapUtils() {}
-
-  /**
-   * Determines the correct schema version to use for bootstrapping a realm.
-   *
-   * @param databaseType The database type being used (determines latest available schema version).
-   * @param currentSchemaVersion The current version of the database schema.
-   * @param requiredSchemaVersion The requested schema version (-1 for auto-detection).
-   * @param hasAlreadyBootstrappedRealms Flag indicating if any realms already exist.
-   * @return The calculated bootstrap schema version.
-   * @throws IllegalStateException if the combination of parameters represents an invalid state.
-   */
-  public static int getRealmBootstrapSchemaVersion(
-      DatabaseType databaseType,
-      int currentSchemaVersion,
-      int requiredSchemaVersion,
-      boolean hasAlreadyBootstrappedRealms) {
-
-    int latestSchemaVersion = databaseType.getLatestSchemaVersion();
-
-    // If versions already match, no change is needed.
-    if (currentSchemaVersion == requiredSchemaVersion) {
-      return requiredSchemaVersion;
-    }
-
-    // Handle fresh installations where no schema version is recorded (version 0).
-    if (currentSchemaVersion == 0) {
-      if (hasAlreadyBootstrappedRealms) {
-        // System was bootstrapped with v1 before schema versioning was introduced.
-        if (requiredSchemaVersion == -1 || requiredSchemaVersion == 1) {
-          return 1;
-        }
-      } else {
-        // A truly fresh start. Default to latest version for this database type for auto-detection,
-        // otherwise use the specified version.
-        return requiredSchemaVersion == -1 ? latestSchemaVersion : requiredSchemaVersion;
-      }
-    }
-
-    // Handle auto-detection on an existing installation (current version > 0).
-    if (requiredSchemaVersion == -1) {
-      // Use the current version if realms already exist; otherwise, use latest version for the new
-      // realm.
-      return hasAlreadyBootstrappedRealms ? currentSchemaVersion : latestSchemaVersion;
-    }
-
-    // Any other combination is an unhandled or invalid migration path.
-    throw new IllegalStateException(
-        String.format(
-            "Cannot determine bootstrap schema version. Current: %d, Required: %d, Bootstrapped: %b, Database: %s",
-            currentSchemaVersion,
-            requiredSchemaVersion,
-            hasAlreadyBootstrappedRealms,
-            databaseType));
-  }
-
-  /**
-   * Extracts the requested schema version from the provided BootstrapOptions.
-   *
-   * @param bootstrapOptions: The bootstrap options containing schema information from which to
-   *     extract the version.
-   * @return The requested schema version, or -1 if not specified.
-   */
-  public static int getRequestedSchemaVersion(BootstrapOptions bootstrapOptions) {
-    SchemaOptions schemaOptions = bootstrapOptions.schemaOptions();
-    if (schemaOptions != null) {
-      Optional<Integer> version = schemaOptions.schemaVersion();
-      if (version.isPresent()) {
-        return version.get();
-      }
-    }
-    return -1;
-  }
-}
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
index c67bbccb67..67f32f667d 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/JdbcMetaStoreManagerFactory.java
@@ -35,10 +35,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import javax.sql.DataSource;
 import org.apache.polaris.core.PolarisCallContext;
 import org.apache.polaris.core.PolarisDiagnostics;
-import org.apache.polaris.core.config.BehaviorChangeConfiguration;
 import org.apache.polaris.core.config.RealmConfig;
-import org.apache.polaris.core.config.RealmConfigImpl;
-import org.apache.polaris.core.config.RealmConfigurationSource;
 import org.apache.polaris.core.context.RealmContext;
 import org.apache.polaris.core.entity.PrincipalEntity;
 import org.apache.polaris.core.persistence.AtomicOperationMetaStoreManager;
@@ -48,9 +45,7 @@ import org.apache.polaris.core.persistence.PolarisMetaStoreManager;
 import org.apache.polaris.core.persistence.PrincipalSecretsGenerator;
 import org.apache.polaris.core.persistence.bootstrap.BootstrapOptions;
 import org.apache.polaris.core.persistence.bootstrap.ImmutableBootstrapOptions;
-import org.apache.polaris.core.persistence.bootstrap.ImmutableSchemaOptions;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
-import org.apache.polaris.core.persistence.bootstrap.SchemaOptions;
 import org.apache.polaris.core.persistence.cache.EntityCache;
 import org.apache.polaris.core.persistence.cache.InMemoryEntityCache;
 import org.apache.polaris.core.persistence.dao.entity.BaseResult;
@@ -76,17 +71,16 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
   // Stateful per-realm cache — InMemoryEntityCache accumulates entries across requests
   private final Map<String, EntityCache> entityCacheMap = new ConcurrentHashMap<>();
 
-  // Cached per-realm schema version — loaded from DB once, stable at runtime
-  private final ConcurrentHashMap<String, Integer> schemaVersionCache = new ConcurrentHashMap<>();
-
   // Tracks realms that have already passed the bootstrap verification check
   // (checkPolarisServiceBootstrappedForRealm), avoiding redundant DB hits on subsequent calls.
   private final Set<String> verifiedRealms = ConcurrentHashMap.newKeySet();
 
+  // Ensures the schema compatibility check runs at most once per factory lifetime.
+  private volatile boolean schemaCompatibilityValidated = false;
+
   @Inject Clock clock;
   @Inject PolarisDiagnostics diagnostics;
   @Inject DatasourceOperations datasourceOperations;
-  @Inject RealmConfigurationSource realmConfigurationSource;
 
   protected JdbcMetaStoreManagerFactory() {}
 
@@ -110,48 +104,37 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
     return new AtomicOperationMetaStoreManager(clock, diagnostics);
   }
 
-  /** Loads and caches the schema version for the given realm (DB hit only on first call). */
-  private int getOrLoadSchemaVersion(String realmId, boolean fallbackOnDne) {
-    return schemaVersionCache.computeIfAbsent(
-        realmId,
-        k -> JdbcBasePersistenceImpl.loadSchemaVersion(datasourceOperations, fallbackOnDne));
+  private void ensureSchemaCompatibility() {
+    if (!schemaCompatibilityValidated) {
+      datasourceOperations.validateSchemaCompatibility();
+      schemaCompatibilityValidated = true;
+    }
   }
 
   /** Creates a new stateless {@link JdbcBasePersistenceImpl} for the given realm. */
   private JdbcBasePersistenceImpl createSession(
-      String realmId, @Nullable RootCredentialsSet rootCredentialsSet, boolean fallbackOnDne) {
-    int schemaVersion = getOrLoadSchemaVersion(realmId, fallbackOnDne);
+      String realmId, @Nullable RootCredentialsSet rootCredentialsSet) {
     return new JdbcBasePersistenceImpl(
-        diagnostics,
-        datasourceOperations,
-        secretsGenerator(realmId, rootCredentialsSet),
-        realmId,
-        schemaVersion);
+        diagnostics, datasourceOperations, secretsGenerator(realmId, rootCredentialsSet), realmId);
   }
 
   private JdbcBasePersistenceImpl createJdbcPersistence(RealmContext realmContext) {
     String realmId = realmContext.getRealmIdentifier();
-    RealmConfig realmConfig = new RealmConfigImpl(realmConfigurationSource, realmContext);
-    boolean fallbackOnDne =
-        realmConfig.getConfig(BehaviorChangeConfiguration.SCHEMA_VERSION_FALL_BACK_ON_DNE);
 
     if (!verifiedRealms.contains(realmId)) {
-      checkPolarisServiceBootstrappedForRealm(realmContext, fallbackOnDne);
+      checkPolarisServiceBootstrappedForRealm(realmContext);
     }
 
-    return createSession(realmId, null, fallbackOnDne);
+    return createSession(realmId, null);
   }
 
   @Override
   public synchronized Map<String, PrincipalSecretsResult> bootstrapRealms(
       Iterable<String> realms, RootCredentialsSet rootCredentialsSet) {
-    SchemaOptions schemaOptions = ImmutableSchemaOptions.builder().build();
-
     BootstrapOptions bootstrapOptions =
         ImmutableBootstrapOptions.builder()
             .realms(realms)
             .rootCredentialsSet(rootCredentialsSet)
-            .schemaOptions(schemaOptions)
             .build();
 
     return bootstrapRealms(bootstrapOptions);
@@ -165,35 +148,18 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
     for (String realm : bootstrapOptions.realms()) {
       RealmContext realmContext = () -> realm;
       if (!verifiedRealms.contains(realm)) {
-        int currentSchemaVersion =
-            JdbcBasePersistenceImpl.loadSchemaVersion(datasourceOperations, true);
-        int requestedSchemaVersion = JdbcBootstrapUtils.getRequestedSchemaVersion(bootstrapOptions);
-        int effectiveSchemaVersion =
-            JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-                datasourceOperations.getDatabaseType(),
-                currentSchemaVersion,
-                requestedSchemaVersion,
-                JdbcBasePersistenceImpl.entityTableExists(datasourceOperations));
-        LOGGER.info(
-            "Effective schema version: {} for bootstrapping realm: {}",
-            effectiveSchemaVersion,
-            realm);
         try {
-          // Run the set-up script to create the tables.
           datasourceOperations.executeScript(
-              datasourceOperations
-                  .getDatabaseType()
-                  .openInitScriptResource(effectiveSchemaVersion));
+              datasourceOperations.getDatabaseType().openInitScriptResource());
         } catch (SQLException e) {
           throw new RuntimeException(
               String.format("Error executing sql script: %s", e.getMessage()), e);
         }
-        // Cache the effective schema version for this realm
-        schemaVersionCache.put(realm, effectiveSchemaVersion);
+        ensureSchemaCompatibility();
 
         PolarisMetaStoreManager metaStoreManager = createNewMetaStoreManager();
         JdbcBasePersistenceImpl metaStore =
-            createSession(realm, bootstrapOptions.rootCredentialsSet(), true);
+            createSession(realm, bootstrapOptions.rootCredentialsSet());
         PolarisCallContext polarisContext = new PolarisCallContext(realmContext, metaStore);
 
         PrincipalSecretsResult secretsResult =
@@ -213,7 +179,7 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
     for (String realm : realms) {
       RealmContext realmContext = () -> realm;
       PolarisMetaStoreManager metaStoreManager = createNewMetaStoreManager();
-      JdbcBasePersistenceImpl session = createSession(realm, null, true);
+      JdbcBasePersistenceImpl session = createSession(realm, null);
 
       PolarisCallContext callContext = new PolarisCallContext(realmContext, session);
 
@@ -231,7 +197,6 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
 
       // Evict all cached state for this realm
       entityCacheMap.remove(realm);
-      schemaVersionCache.remove(realm);
       verifiedRealms.remove(realm);
     }
 
@@ -269,11 +234,11 @@ public class JdbcMetaStoreManagerFactory implements MetaStoreManagerFactory {
    * and force user to run Bootstrap command and initialize MetaStore and create all the required
    * entities
    */
-  private void checkPolarisServiceBootstrappedForRealm(
-      RealmContext realmContext, boolean fallbackOnDne) {
+  private void checkPolarisServiceBootstrappedForRealm(RealmContext realmContext) {
+    ensureSchemaCompatibility();
     String realmId = realmContext.getRealmIdentifier();
     PolarisMetaStoreManager metaStoreManager = createNewMetaStoreManager();
-    JdbcBasePersistenceImpl metaStore = createSession(realmId, null, fallbackOnDne);
+    JdbcBasePersistenceImpl metaStore = createSession(realmId, null);
     PolarisCallContext polarisContext = new PolarisCallContext(realmContext, metaStore);
 
     Optional<PrincipalEntity> rootPrincipal = metaStoreManager.findRootPrincipal(polarisContext);
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/QueryGenerator.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/QueryGenerator.java
index ccfe8f3f30..9d0b776c18 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/QueryGenerator.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/QueryGenerator.java
@@ -164,19 +164,17 @@ public class QueryGenerator {
    * Builds a SELECT query using a list of entity ID pairs (catalog_id, id).
    *
    * @param realmId Realm to filter by.
-   * @param schemaVersion The schema version of entities table to query
    * @param entityIds List of PolarisEntityId pairs.
    * @return SELECT query to retrieve matching entities.
    * @throws IllegalArgumentException if entityIds is empty.
    */
   public static PreparedQuery generateSelectQueryWithEntityIds(
-      @NonNull String realmId, int schemaVersion, @NonNull List<PolarisEntityId> entityIds) {
-    return generateSelectQueryWithEntityIds(
-        realmId, ModelEntity.getAllColumnNames(schemaVersion), entityIds);
+      @NonNull String realmId, @NonNull List<PolarisEntityId> entityIds) {
+    return generateSelectQueryWithEntityIds(realmId, ModelEntity.getAllColumnNames(), entityIds);
   }
 
   /**
-   * Like {@link #generateSelectQueryWithEntityIds(String, int, List)} but selects only {@link
+   * Like {@link #generateSelectQueryWithEntityIds(String, List)} but selects only {@link
    * ModelEntity#VERSION_COLUMNS}. Used by {@code lookupEntityVersions} to avoid fetching large JSON
    * property blobs on the cache-validation hot path.
    */
@@ -349,9 +347,10 @@ public class QueryGenerator {
     return new QueryFragment(clause, parameters);
   }
 
-  @VisibleForTesting
-  static PreparedQuery generateVersionQuery() {
-    return new PreparedQuery("SELECT version_value FROM VERSION", List.of());
+  /** Returns a query that reads the current schema version. */
+  public static PreparedQuery generateVersionQuery() {
+    return new PreparedQuery(
+        "SELECT version_value FROM VERSION WHERE version_key = ?", List.of("version"));
   }
 
   /**
@@ -367,12 +366,6 @@ public class QueryGenerator {
     return new PreparedQuery(sql, where.parameters());
   }
 
-  @VisibleForTesting
-  static PreparedQuery generateEntityTableExistQuery() {
-    return new PreparedQuery(
-        String.format("SELECT * FROM %s LIMIT 1", ModelEntity.TABLE_NAME), List.of());
-  }
-
   /**
    * Generate a SELECT query to find any entities that have a given realm &amp; parent and that may
    * overlap with a given location. The check is performed without consideration for the scheme, so
@@ -385,14 +378,13 @@ public class QueryGenerator {
    * and {@code ///} are retained so scheme-root ancestors remain visible to the overlap check.
    *
    * @param realmId A realm to search within
-   * @param schemaVersion The schema version of entities table to query
    * @param catalogId A catalog entity to search within
    * @param baseLocation The base location to look for overlap with, with or without a scheme
    * @return The list of possibly overlapping entities that meet the criteria
    */
   @VisibleForTesting
   public static PreparedQuery generateOverlapQuery(
-      String realmId, int schemaVersion, long catalogId, String baseLocation) {
+      String realmId, long catalogId, String baseLocation) {
     StorageLocation baseStorageLocation = StorageLocation.of(baseLocation);
     String locationWithoutScheme = baseStorageLocation.withoutScheme();
 
@@ -453,10 +445,7 @@ public class QueryGenerator {
     QueryFragment where = new QueryFragment(clause, finalParams);
     PreparedQuery query =
         generateSelectQuery(
-            ModelEntity.getAllColumnNames(schemaVersion),
-            ModelEntity.TABLE_NAME,
-            where.sql(),
-            null);
+            ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, where.sql(), null);
     return new PreparedQuery(query.sql(), where.parameters());
   }
 
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEntity.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEntity.java
index e8075db4c5..9c7861c8e5 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEntity.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEntity.java
@@ -36,24 +36,6 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
   public static final String ID_COLUMN = "id";
 
   private static final List<String> ALL_COLUMNS =
-      List.of(
-          "id",
-          "catalog_id",
-          "parent_id",
-          "type_code",
-          "name",
-          "entity_version",
-          "sub_type_code",
-          "create_timestamp",
-          "drop_timestamp",
-          "purge_timestamp",
-          "to_purge_timestamp",
-          "last_update_timestamp",
-          "properties",
-          "internal_properties",
-          "grant_records_version");
-
-  private static final List<String> ALL_COLUMNS_V2 =
       List.of(
           "id",
           "catalog_id",
@@ -72,12 +54,8 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
           "grant_records_version",
           "location_without_scheme");
 
-  public static List<String> getAllColumnNames(int schemaVersion) {
-    if (schemaVersion < 2) {
-      return ALL_COLUMNS;
-    } else {
-      return ALL_COLUMNS_V2;
-    }
+  public static List<String> getAllColumnNames() {
+    return ALL_COLUMNS;
   }
 
   public static final List<String> ENTITY_LOOKUP_COLUMNS =
@@ -136,14 +114,6 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
   // location for the entity but without a scheme, when applicable
   private String locationWithoutScheme;
 
-  // schema version of the entity
-  // NOTE: this field is not stored in the database, but is used to handle schema changes
-  private int schemaVersion;
-
-  public ModelEntity(int schemaVersion) {
-    this.schemaVersion = schemaVersion;
-  }
-
   public ModelEntity() {}
 
   public long getId() {
@@ -210,10 +180,6 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
     return locationWithoutScheme;
   }
 
-  public int getSchemaVersion() {
-    return schemaVersion;
-  }
-
   public static Builder builder() {
     return new Builder();
   }
@@ -238,8 +204,7 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
             .properties(r.getString("properties"))
             .internalProperties(r.getString("internal_properties"))
             .grantRecordsVersion(r.getInt("grant_records_version"))
-            .locationWithoutScheme(
-                this.schemaVersion >= 2 ? r.getString("location_without_scheme") : null)
+            .locationWithoutScheme(r.getString("location_without_scheme"))
             .build();
 
     return toEntity(modelEntity);
@@ -268,9 +233,7 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
       map.put("internal_properties", this.getInternalProperties());
     }
     map.put("grant_records_version", this.getGrantRecordsVersion());
-    if (this.getSchemaVersion() >= 2) {
-      map.put("location_without_scheme", this.getLocationWithoutScheme());
-    }
+    map.put("location_without_scheme", this.getLocationWithoutScheme());
     return map;
   }
 
@@ -361,17 +324,12 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
       return this;
     }
 
-    public Builder schemaVersion(int schemaVersion) {
-      entity.schemaVersion = schemaVersion;
-      return this;
-    }
-
     public ModelEntity build() {
       return entity;
     }
   }
 
-  public static ModelEntity fromEntity(PolarisBaseEntity entity, int schemaVersion) {
+  public static ModelEntity fromEntity(PolarisBaseEntity entity) {
     var builder =
         ModelEntity.builder()
             .catalogId(entity.getCatalogId())
@@ -406,8 +364,6 @@ public class ModelEntity implements Converter<PolarisBaseEntity> {
               .withoutScheme());
     }
 
-    builder.schemaVersion(schemaVersion);
-
     return builder.build();
   }
 
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEvent.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEvent.java
index 0a3de44a25..9bdfd0b521 100644
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEvent.java
+++ b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEvent.java
@@ -44,14 +44,9 @@ public interface ModelEvent extends Converter<EventEntity> {
   String ADDITIONAL_PROPERTIES = "additional_properties";
 
   /**
-   * Legacy sentinel stored in {@code events.catalog_id} for events that are not catalog-scoped on
-   * schema versions &lt; 5, where the column is {@code NOT NULL}. Never exposed outside the JDBC
-   * layer: {@link #fromEvent(EventEntity, int)} substitutes it for a null catalog id on pre-v5
-   * schemas, and {@link #fromResultSet} coalesces it back to null on read.
-   *
-   * <p>Because {@link #fromResultSet} cannot know which schema version a row was written under, the
-   * coalescing is unconditional, so this string remains reserved on all schema versions: a catalog
-   * literally named {@code __realm__} would have its events read back as realm-scoped.
+   * Legacy sentinel that was stored in {@code events.catalog_id} for realm-scoped events on schema
+   * versions &lt; 5, where the column was {@code NOT NULL}. Coalesced back to null on read so that
+   * rows written by older Polaris versions are still readable.
    */
   String LEGACY_REALM_SCOPED_CATALOG_ID = "__realm__";
 
@@ -148,16 +143,10 @@ public interface ModelEvent extends Converter<EventEntity> {
     return map;
   }
 
-  static ModelEvent fromEvent(EventEntity event, int schemaVersion) {
+  static ModelEvent fromEvent(EventEntity event) {
     if (event == null) return null;
-
-    String catalogId = event.getCatalogId();
-    if (schemaVersion < 5 && catalogId == null) {
-      // Schema versions < 5 declare events.catalog_id NOT NULL; store the legacy sentinel there.
-      catalogId = LEGACY_REALM_SCOPED_CATALOG_ID;
-    }
     return ImmutableModelEvent.builder()
-        .catalogId(catalogId)
+        .catalogId(event.getCatalogId())
         .eventId(event.getId())
         .requestId(event.getRequestId())
         .eventType(event.getEventType())
diff --git a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/SchemaVersion.java b/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/SchemaVersion.java
deleted file mode 100644
index dc8db05b36..0000000000
--- a/persistence/relational-jdbc/src/main/java/org/apache/polaris/persistence/relational/jdbc/models/SchemaVersion.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.polaris.persistence.relational.jdbc.models;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Map;
-import org.apache.polaris.persistence.relational.jdbc.DatabaseType;
-
-public class SchemaVersion implements Converter<SchemaVersion> {
-  public static final SchemaVersion MINIMUM = new SchemaVersion(0);
-
-  private final Integer value;
-
-  public SchemaVersion() {
-    this.value = null;
-  }
-
-  private SchemaVersion(int value) {
-    this.value = value;
-  }
-
-  public int getValue() {
-    if (value == null) {
-      throw new IllegalStateException("Schema version should be constructed via fromResultSet");
-    }
-    return value;
-  }
-
-  @Override
-  public SchemaVersion fromResultSet(ResultSet rs) throws SQLException {
-    return new SchemaVersion(rs.getInt("version_value"));
-  }
-
-  @Override
-  public Map<String, Object> toMap(DatabaseType databaseType) {
-    return Map.of("version_value", this.value);
-  }
-}
diff --git a/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v4.sql b/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v4.sql
deleted file mode 100644
index b982bae991..0000000000
--- a/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v4.sql
+++ /dev/null
@@ -1,308 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- CockroachDB schema v4 (matching PostgreSQL schema v4)
--- Schema version is kept in sync with PostgreSQL to ensure correct column selection in ModelEntity.
--- Changes from v3:
---  * Added `idempotency_records` table for REST idempotency
---  * Added `scan_metrics_report` table
---  * Added `commit_metrics_report` table
--- Features:
---  * Uses INT4 explicitly for all integer columns (required for CockroachDB JDBC driver)
---  * Includes all tables: version, entities, grant_records, principal_authentication_data,
---    policy_mapping_record, events, idempotency_records, scan_metrics_report, commit_metrics_report
---  * Compatible with PostgreSQL wire protocol
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET search_path TO POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INT4 NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 4)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT4 NOT NULL,
-    type_code INT4 NOT NULL,
-    sub_type_code INT4 NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT4 NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, parent_id, location_without_scheme)
-    WHERE location_without_scheme IS NOT NULL;
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INT4,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INT4 NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT NOT NULL,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (event_id)
-);
-
--- Idempotency records (key-only idempotency; durable replay)
-CREATE TABLE IF NOT EXISTS idempotency_records (
-    realm_id TEXT NOT NULL,
-    idempotency_key TEXT NOT NULL,
-    operation_type TEXT NOT NULL,
-    resource_id TEXT NOT NULL,            -- normalized request-derived resource identifier (not a generated entity id)
-
-    -- Finalization/replay
-    http_status INT4,                    -- NULL while IN_PROGRESS; set only on finalized 2xx/terminal 4xx
-    error_subtype TEXT,                  -- optional: e.g., already_exists, namespace_not_empty, idempotency_replay_failed
-    response_summary TEXT,               -- minimal body to reproduce equivalent response (JSON string)
-    response_headers TEXT,               -- small whitelisted headers to replay (JSON string)
-    finalized_at TIMESTAMP,              -- when http_status was written
-
-    -- Liveness/ops
-    created_at TIMESTAMP NOT NULL,
-    updated_at TIMESTAMP NOT NULL,
-    heartbeat_at TIMESTAMP,              -- updated by owner while IN_PROGRESS
-    executor_id TEXT,                    -- owner pod/worker id
-    expires_at TIMESTAMP,
-
-    PRIMARY KEY (realm_id, idempotency_key)
-);
-
--- Helpful indexes
-CREATE INDEX IF NOT EXISTS idx_idemp_realm_expires
-    ON idempotency_records (realm_id, expires_at);
-
--- ============================================================================
--- SCAN METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS scan_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Scan context
-    snapshot_id BIGINT,
-    schema_id INT4,
-    filter_expression TEXT,
-    projected_field_ids TEXT,
-    projected_field_names TEXT,
-
-    -- Scan metrics
-    result_data_files BIGINT DEFAULT 0,
-    result_delete_files BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-    total_data_manifests BIGINT DEFAULT 0,
-    total_delete_manifests BIGINT DEFAULT 0,
-    scanned_data_manifests BIGINT DEFAULT 0,
-    scanned_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_manifests BIGINT DEFAULT 0,
-    skipped_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_files BIGINT DEFAULT 0,
-    skipped_delete_files BIGINT DEFAULT 0,
-    total_planning_duration_ms BIGINT DEFAULT 0,
-
-    -- Equality/positional delete metrics
-    equality_delete_files BIGINT DEFAULT 0,
-    positional_delete_files BIGINT DEFAULT 0,
-    indexed_delete_files BIGINT DEFAULT 0,
-    total_delete_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE scan_metrics_report IS 'Scan metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_scan_report_timestamp ON scan_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_scan_report_lookup ON scan_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- ============================================================================
--- COMMIT METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS commit_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Commit context
-    snapshot_id BIGINT NOT NULL,
-    sequence_number BIGINT,
-    operation TEXT NOT NULL,
-
-    -- File metrics
-    added_data_files BIGINT DEFAULT 0,
-    removed_data_files BIGINT DEFAULT 0,
-    total_data_files BIGINT DEFAULT 0,
-    added_delete_files BIGINT DEFAULT 0,
-    removed_delete_files BIGINT DEFAULT 0,
-    total_delete_files BIGINT DEFAULT 0,
-
-    -- Equality delete files
-    added_equality_delete_files BIGINT DEFAULT 0,
-    removed_equality_delete_files BIGINT DEFAULT 0,
-
-    -- Positional delete files
-    added_positional_delete_files BIGINT DEFAULT 0,
-    removed_positional_delete_files BIGINT DEFAULT 0,
-
-    -- Record metrics
-    added_records BIGINT DEFAULT 0,
-    removed_records BIGINT DEFAULT 0,
-    total_records BIGINT DEFAULT 0,
-
-    -- Size metrics
-    added_file_size_bytes BIGINT DEFAULT 0,
-    removed_file_size_bytes BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Duration and attempts
-    total_duration_ms BIGINT DEFAULT 0,
-    attempts INT4 DEFAULT 1,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE commit_metrics_report IS 'Commit metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- INT4 type used directly in table definitions for CockroachDB JDBC compatibility
--- CockroachDB requires explicit INT4 type declarations to correctly map columns to Java's Integer type.
--- Using generic INTEGER or INT types causes type mapping failures in CockroachDB's JDBC driver.
--- INT4 is equivalent to INTEGER in PostgreSQL, ensuring compatibility with both databases.
diff --git a/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v6.sql b/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v6.sql
deleted file mode 100644
index 9bf7e76779..0000000000
--- a/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v6.sql
+++ /dev/null
@@ -1,288 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- CockroachDB schema v6 (matching PostgreSQL schema v6)
--- Schema version is kept in sync with PostgreSQL to ensure correct column selection in ModelEntity.
--- Changes from v5:
---  * `idx_locations` now leads with `catalog_id` instead of `parent_id`, matching the predicate in
---    QueryGenerator.generateOverlapQuery (WHERE realm_id = ? AND catalog_id = ?). The previous
---    definition let the optimized sibling check (OPTIMIZED_SIBLING_CHECK) use only the realm_id
---    prefix, degrading CREATE TABLE / CREATE NAMESPACE to a realm-wide scan.
---  * `idx_grants_realm_grantee`, `idx_grants_realm_securable` and `idx_entities_catalog_id_id`
---    are now declared, matching PostgreSQL and H2, which have carried them since v4. Without the
---    first, JdbcBasePersistenceImpl.loadAllGrantRecordsOnGrantee can use only the realm_id prefix
---    of the grant_records primary key, degrading grant lookups by grantee to a realm-wide scan.
--- Features:
---  * Uses INT4 explicitly for all integer columns (required for CockroachDB JDBC driver)
---  * Includes all tables: version, entities, grant_records, principal_authentication_data,
---    policy_mapping_record, events, scan_metrics_report, commit_metrics_report
---  * Compatible with PostgreSQL wire protocol
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INT4 NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 6)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT4 NOT NULL,
-    type_code INT4 NOT NULL,
-    sub_type_code INT4 NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT4 NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, catalog_id, location_without_scheme)
-    WHERE location_without_scheme IS NOT NULL;
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INT4,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee
-    ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable
-    ON grant_records (realm_id, securable_id);
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INT4 NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (event_id)
-);
-
--- ============================================================================
--- SCAN METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS scan_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Scan context
-    snapshot_id BIGINT,
-    schema_id INT4,
-    filter_expression TEXT,
-    projected_field_ids TEXT,
-    projected_field_names TEXT,
-
-    -- Scan metrics
-    result_data_files BIGINT DEFAULT 0,
-    result_delete_files BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-    total_data_manifests BIGINT DEFAULT 0,
-    total_delete_manifests BIGINT DEFAULT 0,
-    scanned_data_manifests BIGINT DEFAULT 0,
-    scanned_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_manifests BIGINT DEFAULT 0,
-    skipped_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_files BIGINT DEFAULT 0,
-    skipped_delete_files BIGINT DEFAULT 0,
-    total_planning_duration_ms BIGINT DEFAULT 0,
-
-    -- Equality/positional delete metrics
-    equality_delete_files BIGINT DEFAULT 0,
-    positional_delete_files BIGINT DEFAULT 0,
-    indexed_delete_files BIGINT DEFAULT 0,
-    total_delete_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE scan_metrics_report IS 'Scan metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_scan_report_timestamp ON scan_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_scan_report_lookup ON scan_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- ============================================================================
--- COMMIT METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS commit_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Commit context
-    snapshot_id BIGINT NOT NULL,
-    sequence_number BIGINT,
-    operation TEXT NOT NULL,
-
-    -- File metrics
-    added_data_files BIGINT DEFAULT 0,
-    removed_data_files BIGINT DEFAULT 0,
-    total_data_files BIGINT DEFAULT 0,
-    added_delete_files BIGINT DEFAULT 0,
-    removed_delete_files BIGINT DEFAULT 0,
-    total_delete_files BIGINT DEFAULT 0,
-
-    -- Equality delete files
-    added_equality_delete_files BIGINT DEFAULT 0,
-    removed_equality_delete_files BIGINT DEFAULT 0,
-
-    -- Positional delete files
-    added_positional_delete_files BIGINT DEFAULT 0,
-    removed_positional_delete_files BIGINT DEFAULT 0,
-
-    -- Record metrics
-    added_records BIGINT DEFAULT 0,
-    removed_records BIGINT DEFAULT 0,
-    total_records BIGINT DEFAULT 0,
-
-    -- Size metrics
-    added_file_size_bytes BIGINT DEFAULT 0,
-    removed_file_size_bytes BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Duration and attempts
-    total_duration_ms BIGINT DEFAULT 0,
-    attempts INT4 DEFAULT 1,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE commit_metrics_report IS 'Commit metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- INT4 type used directly in table definitions for CockroachDB JDBC compatibility
--- CockroachDB requires explicit INT4 type declarations to correctly map columns to Java's Integer type.
--- Using generic INTEGER or INT types causes type mapping failures in CockroachDB's JDBC driver.
--- INT4 is equivalent to INTEGER in PostgreSQL, ensuring compatibility with both databases.
diff --git a/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v5.sql b/persistence/relational-jdbc/src/main/resources/cockroachdb/schema.sql
similarity index 93%
rename from persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v5.sql
rename to persistence/relational-jdbc/src/main/resources/cockroachdb/schema.sql
index 4816b9f797..06199203ca 100644
--- a/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v5.sql
+++ b/persistence/relational-jdbc/src/main/resources/cockroachdb/schema.sql
@@ -16,28 +16,27 @@
 -- specific language governing permissions and limitations
 -- under the License.
 
--- CockroachDB schema v5 (matching PostgreSQL schema v5)
--- Schema version is kept in sync with PostgreSQL to ensure correct column selection in ModelEntity.
--- Changes from v4:
---  * Removed the `idempotency_records` table (the durable idempotency store it
---    backed was never wired into any request path and has been removed)
---  * `events.catalog_id` is nullable; events that are not catalog-scoped store NULL (issue #4674)
+-- CockroachDB schema (in sync with PostgreSQL schema)
 -- Features:
 --  * Uses INT4 explicitly for all integer columns (required for CockroachDB JDBC driver)
 --  * Includes all tables: version, entities, grant_records, principal_authentication_data,
 --    policy_mapping_record, events, scan_metrics_report, commit_metrics_report
 --  * Compatible with PostgreSQL wire protocol
 
+-- Note:
+-- INT4 is used directly in table definitions for CockroachDB JDBC compatibility.
+-- CockroachDB requires explicit INT4 type declarations to correctly map columns to Java's Integer type.
+-- Using generic INTEGER or INT types causes type mapping failures in CockroachDB's JDBC driver.
+-- INT4 is equivalent to INTEGER in PostgreSQL, ensuring compatibility with both databases.
 
 CREATE TABLE IF NOT EXISTS version (
     version_key TEXT PRIMARY KEY,
     version_value INT4 NOT NULL
 );
 INSERT INTO version (version_key, version_value)
-VALUES ('version', 5)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
+VALUES ('version', 6)
+ON CONFLICT (version_key) DO NOTHING;
+COMMENT ON TABLE version IS 'JDBC schema version; updated manually as part of upgrade procedures.';
 
 CREATE TABLE IF NOT EXISTS entities (
     realm_id TEXT NOT NULL,
@@ -63,8 +62,9 @@ CREATE TABLE IF NOT EXISTS entities (
 
 -- TODO: create indexes based on all query pattern.
 CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
+CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
 CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, parent_id, location_without_scheme)
+    ON entities USING btree (realm_id, catalog_id, location_without_scheme)
     WHERE location_without_scheme IS NOT NULL;
 
 COMMENT ON TABLE entities IS 'all the entities';
@@ -103,6 +103,11 @@ COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee
 COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
 COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
 
+CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee
+    ON grant_records (realm_id, grantee_id);
+CREATE INDEX IF NOT EXISTS idx_grants_realm_securable
+    ON grant_records (realm_id, securable_id);
+
 CREATE TABLE IF NOT EXISTS principal_authentication_data (
     realm_id TEXT NOT NULL,
     principal_id BIGINT NOT NULL,
@@ -271,8 +276,3 @@ CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(
 
 -- Index for query lookups by catalog_id and table_id
 CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- INT4 type used directly in table definitions for CockroachDB JDBC compatibility
--- CockroachDB requires explicit INT4 type declarations to correctly map columns to Java's Integer type.
--- Using generic INTEGER or INT types causes type mapping failures in CockroachDB's JDBC driver.
--- INT4 is equivalent to INTEGER in PostgreSQL, ensuring compatibility with both databases.
diff --git a/persistence/relational-jdbc/src/main/resources/h2/schema-v1.sql b/persistence/relational-jdbc/src/main/resources/h2/schema-v1.sql
deleted file mode 100644
index 10b4e3774b..0000000000
--- a/persistence/relational-jdbc/src/main/resources/h2/schema-v1.sql
+++ /dev/null
@@ -1,120 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET SCHEMA POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key VARCHAR PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-
-MERGE INTO version (version_key, version_value)
-    KEY (version_key)
-    VALUES ('version', 1);
-
--- H2 supports COMMENT, but some modes may ignore it
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-DROP TABLE IF EXISTS entities;
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties TEXT NOT NULL DEFAULT '{}',
-    internal_properties TEXT NOT NULL DEFAULT '{}',
-    grant_records_version INT NOT NULL,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-DROP TABLE IF EXISTS grant_records;
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-DROP TABLE IF EXISTS principal_authentication_data;
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-DROP TABLE IF EXISTS policy_mapping_record;
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters TEXT NOT NULL DEFAULT '{}',
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
diff --git a/persistence/relational-jdbc/src/main/resources/h2/schema-v2.sql b/persistence/relational-jdbc/src/main/resources/h2/schema-v2.sql
deleted file mode 100644
index 6cbd6c03ae..0000000000
--- a/persistence/relational-jdbc/src/main/resources/h2/schema-v2.sql
+++ /dev/null
@@ -1,127 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
--- Changes from v1:
---  * Added a `location_without_scheme` column to entities
---  * Added an index `idx_locations` over (realm_id, catalog_id, location_without_scheme) in entities
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET SCHEMA POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key VARCHAR PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-
-MERGE INTO version (version_key, version_value)
-    KEY (version_key)
-    VALUES ('version', 2);
-
--- H2 supports COMMENT, but some modes may ignore it
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-DROP TABLE IF EXISTS entities;
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties TEXT NOT NULL DEFAULT '{}',
-    internal_properties TEXT NOT NULL DEFAULT '{}',
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
-CREATE INDEX IF NOT EXISTS idx_locations ON entities(realm_id, catalog_id, location_without_scheme);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-DROP TABLE IF EXISTS grant_records;
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-DROP TABLE IF EXISTS principal_authentication_data;
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-DROP TABLE IF EXISTS policy_mapping_record;
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters TEXT NOT NULL DEFAULT '{}',
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
diff --git a/persistence/relational-jdbc/src/main/resources/h2/schema-v3.sql b/persistence/relational-jdbc/src/main/resources/h2/schema-v3.sql
deleted file mode 100644
index 3fb7749a3d..0000000000
--- a/persistence/relational-jdbc/src/main/resources/h2/schema-v3.sql
+++ /dev/null
@@ -1,136 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
--- Changes from v2:
---  * Added `events` table
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET SCHEMA POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key VARCHAR PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-
-MERGE INTO version (version_key, version_value)
-    KEY (version_key)
-    VALUES ('version', 3);
-
--- H2 supports COMMENT, but some modes may ignore it
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties TEXT NOT NULL DEFAULT '{}',
-    internal_properties TEXT NOT NULL DEFAULT '{}',
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
-CREATE INDEX IF NOT EXISTS idx_locations ON entities(realm_id, catalog_id, location_without_scheme);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters TEXT NOT NULL DEFAULT '{}',
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT NOT NULL,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties TEXT NOT NULL,
-    PRIMARY KEY (event_id)
-);
\ No newline at end of file
diff --git a/persistence/relational-jdbc/src/main/resources/h2/schema-v4.sql b/persistence/relational-jdbc/src/main/resources/h2/schema-v4.sql
deleted file mode 100644
index 93401b85af..0000000000
--- a/persistence/relational-jdbc/src/main/resources/h2/schema-v4.sql
+++ /dev/null
@@ -1,299 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
--- Changes from v2:
---  * Added `events` table
---  * Added `idempotency_records` table for REST idempotency
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET SCHEMA POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key VARCHAR PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-
-MERGE INTO version (version_key, version_value)
-    KEY (version_key)
-    VALUES ('version', 4);
-
--- H2 supports COMMENT, but some modes may ignore it
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties TEXT NOT NULL DEFAULT '{}',
-    internal_properties TEXT NOT NULL DEFAULT '{}',
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
-CREATE INDEX IF NOT EXISTS idx_locations ON entities(realm_id, catalog_id, location_without_scheme);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee 
-    ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable 
-    ON grant_records (realm_id, securable_id);
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters TEXT NOT NULL DEFAULT '{}',
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT NOT NULL,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties TEXT NOT NULL,
-    PRIMARY KEY (event_id)
-);
-
-CREATE TABLE IF NOT EXISTS idempotency_records (
-    realm_id TEXT NOT NULL,
-    idempotency_key TEXT NOT NULL,
-    operation_type TEXT NOT NULL,
-    resource_id TEXT NOT NULL, -- normalized request-derived resource identifier (not a generated entity id)
-
-    -- Finalization/replay
-    http_status INTEGER,       -- NULL while IN_PROGRESS; set only on finalized 2xx/terminal 4xx
-    error_subtype TEXT,        -- optional: e.g., already_exists, namespace_not_empty, idempotency_replay_failed
-    response_summary TEXT,     -- minimal body to reproduce equivalent response (JSON string)
-    response_headers TEXT,     -- small whitelisted headers to replay (JSON string)
-    finalized_at TIMESTAMP,    -- when http_status was written
-
-    -- Liveness/ops
-    created_at TIMESTAMP NOT NULL,
-    updated_at TIMESTAMP NOT NULL,
-    heartbeat_at TIMESTAMP,  -- updated by owner while IN_PROGRESS
-    executor_id TEXT,        -- owner pod/worker id
-    expires_at TIMESTAMP,
-
-    PRIMARY KEY (realm_id, idempotency_key)
-);
-
-CREATE INDEX IF NOT EXISTS idx_idemp_realm_expires
-    ON idempotency_records (realm_id, expires_at);
-
--- ============================================================================
--- SCAN METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS scan_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Scan context
-    snapshot_id BIGINT,
-    schema_id INTEGER,
-    filter_expression TEXT,
-    projected_field_ids TEXT,
-    projected_field_names TEXT,
-
-    -- Scan metrics
-    result_data_files BIGINT DEFAULT 0,
-    result_delete_files BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-    total_data_manifests BIGINT DEFAULT 0,
-    total_delete_manifests BIGINT DEFAULT 0,
-    scanned_data_manifests BIGINT DEFAULT 0,
-    scanned_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_manifests BIGINT DEFAULT 0,
-    skipped_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_files BIGINT DEFAULT 0,
-    skipped_delete_files BIGINT DEFAULT 0,
-    total_planning_duration_ms BIGINT DEFAULT 0,
-
-    -- Equality/positional delete metrics
-    equality_delete_files BIGINT DEFAULT 0,
-    positional_delete_files BIGINT DEFAULT 0,
-    indexed_delete_files BIGINT DEFAULT 0,
-    total_delete_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Additional metadata (for extensibility)
-    metadata TEXT DEFAULT '{}',
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE scan_metrics_report IS 'Scan metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_scan_report_timestamp ON scan_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_scan_report_lookup ON scan_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- ============================================================================
--- COMMIT METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS commit_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Commit context
-    snapshot_id BIGINT NOT NULL,
-    sequence_number BIGINT,
-    operation TEXT NOT NULL,
-
-    -- File metrics
-    added_data_files BIGINT DEFAULT 0,
-    removed_data_files BIGINT DEFAULT 0,
-    total_data_files BIGINT DEFAULT 0,
-    added_delete_files BIGINT DEFAULT 0,
-    removed_delete_files BIGINT DEFAULT 0,
-    total_delete_files BIGINT DEFAULT 0,
-
-    -- Equality delete files
-    added_equality_delete_files BIGINT DEFAULT 0,
-    removed_equality_delete_files BIGINT DEFAULT 0,
-
-    -- Positional delete files
-    added_positional_delete_files BIGINT DEFAULT 0,
-    removed_positional_delete_files BIGINT DEFAULT 0,
-
-    -- Record metrics
-    added_records BIGINT DEFAULT 0,
-    removed_records BIGINT DEFAULT 0,
-    total_records BIGINT DEFAULT 0,
-
-    -- Size metrics
-    added_file_size_bytes BIGINT DEFAULT 0,
-    removed_file_size_bytes BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Duration and attempts
-    total_duration_ms BIGINT DEFAULT 0,
-    attempts INTEGER DEFAULT 1,
-
-    -- Additional metadata (for extensibility)
-    metadata TEXT DEFAULT '{}',
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE commit_metrics_report IS 'Commit metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
\ No newline at end of file
diff --git a/persistence/relational-jdbc/src/main/resources/h2/schema-v5.sql b/persistence/relational-jdbc/src/main/resources/h2/schema-v5.sql
deleted file mode 100644
index bd8f2736b7..0000000000
--- a/persistence/relational-jdbc/src/main/resources/h2/schema-v5.sql
+++ /dev/null
@@ -1,272 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
--- Changes from v4:
---  * Removed the `idempotency_records` table (the durable idempotency store it
---    backed was never wired into any request path and has been removed)
---  * `events.catalog_id` is nullable; events that are not catalog-scoped store NULL (issue #4674)
-
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key VARCHAR PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-
-MERGE INTO version (version_key, version_value)
-    KEY (version_key)
-    VALUES ('version', 5);
-
--- H2 supports COMMENT, but some modes may ignore it
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties TEXT NOT NULL DEFAULT '{}',
-    internal_properties TEXT NOT NULL DEFAULT '{}',
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
-CREATE INDEX IF NOT EXISTS idx_locations ON entities(realm_id, catalog_id, location_without_scheme);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee 
-    ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable 
-    ON grant_records (realm_id, securable_id);
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters TEXT NOT NULL DEFAULT '{}',
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties TEXT NOT NULL,
-    PRIMARY KEY (event_id)
-);
-
--- ============================================================================
--- SCAN METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS scan_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Scan context
-    snapshot_id BIGINT,
-    schema_id INTEGER,
-    filter_expression TEXT,
-    projected_field_ids TEXT,
-    projected_field_names TEXT,
-
-    -- Scan metrics
-    result_data_files BIGINT DEFAULT 0,
-    result_delete_files BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-    total_data_manifests BIGINT DEFAULT 0,
-    total_delete_manifests BIGINT DEFAULT 0,
-    scanned_data_manifests BIGINT DEFAULT 0,
-    scanned_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_manifests BIGINT DEFAULT 0,
-    skipped_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_files BIGINT DEFAULT 0,
-    skipped_delete_files BIGINT DEFAULT 0,
-    total_planning_duration_ms BIGINT DEFAULT 0,
-
-    -- Equality/positional delete metrics
-    equality_delete_files BIGINT DEFAULT 0,
-    positional_delete_files BIGINT DEFAULT 0,
-    indexed_delete_files BIGINT DEFAULT 0,
-    total_delete_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Additional metadata (for extensibility)
-    metadata TEXT DEFAULT '{}',
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE scan_metrics_report IS 'Scan metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_scan_report_timestamp ON scan_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_scan_report_lookup ON scan_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- ============================================================================
--- COMMIT METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS commit_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Commit context
-    snapshot_id BIGINT NOT NULL,
-    sequence_number BIGINT,
-    operation TEXT NOT NULL,
-
-    -- File metrics
-    added_data_files BIGINT DEFAULT 0,
-    removed_data_files BIGINT DEFAULT 0,
-    total_data_files BIGINT DEFAULT 0,
-    added_delete_files BIGINT DEFAULT 0,
-    removed_delete_files BIGINT DEFAULT 0,
-    total_delete_files BIGINT DEFAULT 0,
-
-    -- Equality delete files
-    added_equality_delete_files BIGINT DEFAULT 0,
-    removed_equality_delete_files BIGINT DEFAULT 0,
-
-    -- Positional delete files
-    added_positional_delete_files BIGINT DEFAULT 0,
-    removed_positional_delete_files BIGINT DEFAULT 0,
-
-    -- Record metrics
-    added_records BIGINT DEFAULT 0,
-    removed_records BIGINT DEFAULT 0,
-    total_records BIGINT DEFAULT 0,
-
-    -- Size metrics
-    added_file_size_bytes BIGINT DEFAULT 0,
-    removed_file_size_bytes BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Duration and attempts
-    total_duration_ms BIGINT DEFAULT 0,
-    attempts INTEGER DEFAULT 1,
-
-    -- Additional metadata (for extensibility)
-    metadata TEXT DEFAULT '{}',
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE commit_metrics_report IS 'Commit metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
diff --git a/persistence/relational-jdbc/src/main/resources/h2/schema-v6.sql b/persistence/relational-jdbc/src/main/resources/h2/schema.sql
similarity index 95%
rename from persistence/relational-jdbc/src/main/resources/h2/schema-v6.sql
rename to persistence/relational-jdbc/src/main/resources/h2/schema.sql
index eabd1aea1b..4a203f2641 100644
--- a/persistence/relational-jdbc/src/main/resources/h2/schema-v6.sql
+++ b/persistence/relational-jdbc/src/main/resources/h2/schema.sql
@@ -17,11 +17,6 @@
 -- under the License.
 --
 
--- Changes from v5:
---  * Schema version bumped to keep H2 in lockstep with Postgres/CockroachDB v6, which correct the
---    `idx_locations` index. H2 already indexes (realm_id, catalog_id, location_without_scheme), so
---    the index definition here is unchanged.
-
 CREATE TABLE IF NOT EXISTS version (
     version_key VARCHAR PRIMARY KEY,
     version_value INTEGER NOT NULL
@@ -32,7 +27,7 @@ MERGE INTO version (version_key, version_value)
     VALUES ('version', 6);
 
 -- H2 supports COMMENT, but some modes may ignore it
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
+COMMENT ON TABLE version IS 'JDBC schema version; updated manually as part of upgrade procedures.';
 
 CREATE TABLE IF NOT EXISTS entities (
     realm_id TEXT NOT NULL,
@@ -96,9 +91,9 @@ COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee
 COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
 COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
 
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee 
+CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee
     ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable 
+CREATE INDEX IF NOT EXISTS idx_grants_realm_securable
     ON grant_records (realm_id, securable_id);
 
 CREATE TABLE IF NOT EXISTS principal_authentication_data (
diff --git a/persistence/relational-jdbc/src/main/resources/postgres/schema-v1.sql b/persistence/relational-jdbc/src/main/resources/postgres/schema-v1.sql
deleted file mode 100644
index 0b02312baa..0000000000
--- a/persistence/relational-jdbc/src/main/resources/postgres/schema-v1.sql
+++ /dev/null
@@ -1,116 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET search_path TO POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 1)
-    ON CONFLICT (version_key) DO UPDATE
-                            SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT NOT NULL,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-DROP TABLE IF EXISTS policy_mapping_record;
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
diff --git a/persistence/relational-jdbc/src/main/resources/postgres/schema-v2.sql b/persistence/relational-jdbc/src/main/resources/postgres/schema-v2.sql
deleted file mode 100644
index 638708d83b..0000000000
--- a/persistence/relational-jdbc/src/main/resources/postgres/schema-v2.sql
+++ /dev/null
@@ -1,124 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- Changes from v1:
---  * Added a `location` column to entities
---  * Added an index `idx_locations` over (realm_id, parent_id, location) in entities
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET search_path TO POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 2)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, parent_id, location_without_scheme)
-    WHERE location_without_scheme IS NOT NULL;
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-DROP TABLE IF EXISTS policy_mapping_record;
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
diff --git a/persistence/relational-jdbc/src/main/resources/postgres/schema-v3.sql b/persistence/relational-jdbc/src/main/resources/postgres/schema-v3.sql
deleted file mode 100644
index 96897f5106..0000000000
--- a/persistence/relational-jdbc/src/main/resources/postgres/schema-v3.sql
+++ /dev/null
@@ -1,136 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- Changes from v2:
---  * Added `events` table
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET search_path TO POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 3)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, parent_id, location_without_scheme)
-    WHERE location_without_scheme IS NOT NULL;
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT NOT NULL,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (event_id)
-);
diff --git a/persistence/relational-jdbc/src/main/resources/postgres/schema-v4.sql b/persistence/relational-jdbc/src/main/resources/postgres/schema-v4.sql
deleted file mode 100644
index 3374e81ff6..0000000000
--- a/persistence/relational-jdbc/src/main/resources/postgres/schema-v4.sql
+++ /dev/null
@@ -1,301 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- Changes from v2:
---  * Added `events` table
---  * Added `idempotency_records` table for REST idempotency
-
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET search_path TO POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 4)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, parent_id, location_without_scheme)
-    WHERE location_without_scheme IS NOT NULL;
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee 
-    ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable 
-    ON grant_records (realm_id, securable_id);
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT NOT NULL,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (event_id)
-);
-
--- Idempotency records (key-only idempotency; durable replay)
-CREATE TABLE IF NOT EXISTS idempotency_records (
-    realm_id TEXT NOT NULL,
-    idempotency_key TEXT NOT NULL,
-    operation_type TEXT NOT NULL,
-    resource_id TEXT NOT NULL,            -- normalized request-derived resource identifier (not a generated entity id)
-
-    -- Finalization/replay
-    http_status INTEGER,                 -- NULL while IN_PROGRESS; set only on finalized 2xx/terminal 4xx
-    error_subtype TEXT,                  -- optional: e.g., already_exists, namespace_not_empty, idempotency_replay_failed
-    response_summary TEXT,               -- minimal body to reproduce equivalent response (JSON string)
-    response_headers TEXT,               -- small whitelisted headers to replay (JSON string)
-    finalized_at TIMESTAMP,              -- when http_status was written
-
-    -- Liveness/ops
-    created_at TIMESTAMP NOT NULL,
-    updated_at TIMESTAMP NOT NULL,
-    heartbeat_at TIMESTAMP,              -- updated by owner while IN_PROGRESS
-    executor_id TEXT,                    -- owner pod/worker id
-    expires_at TIMESTAMP,
-
-    PRIMARY KEY (realm_id, idempotency_key)
-);
-
--- Helpful indexes
-CREATE INDEX IF NOT EXISTS idx_idemp_realm_expires
-    ON idempotency_records (realm_id, expires_at);
-
--- ============================================================================
--- SCAN METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS scan_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Scan context
-    snapshot_id BIGINT,
-    schema_id INTEGER,
-    filter_expression TEXT,
-    projected_field_ids TEXT,
-    projected_field_names TEXT,
-
-    -- Scan metrics
-    result_data_files BIGINT DEFAULT 0,
-    result_delete_files BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-    total_data_manifests BIGINT DEFAULT 0,
-    total_delete_manifests BIGINT DEFAULT 0,
-    scanned_data_manifests BIGINT DEFAULT 0,
-    scanned_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_manifests BIGINT DEFAULT 0,
-    skipped_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_files BIGINT DEFAULT 0,
-    skipped_delete_files BIGINT DEFAULT 0,
-    total_planning_duration_ms BIGINT DEFAULT 0,
-
-    -- Equality/positional delete metrics
-    equality_delete_files BIGINT DEFAULT 0,
-    positional_delete_files BIGINT DEFAULT 0,
-    indexed_delete_files BIGINT DEFAULT 0,
-    total_delete_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE scan_metrics_report IS 'Scan metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_scan_report_timestamp ON scan_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_scan_report_lookup ON scan_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- ============================================================================
--- COMMIT METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS commit_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Commit context
-    snapshot_id BIGINT NOT NULL,
-    sequence_number BIGINT,
-    operation TEXT NOT NULL,
-
-    -- File metrics
-    added_data_files BIGINT DEFAULT 0,
-    removed_data_files BIGINT DEFAULT 0,
-    total_data_files BIGINT DEFAULT 0,
-    added_delete_files BIGINT DEFAULT 0,
-    removed_delete_files BIGINT DEFAULT 0,
-    total_delete_files BIGINT DEFAULT 0,
-
-    -- Equality delete files
-    added_equality_delete_files BIGINT DEFAULT 0,
-    removed_equality_delete_files BIGINT DEFAULT 0,
-
-    -- Positional delete files
-    added_positional_delete_files BIGINT DEFAULT 0,
-    removed_positional_delete_files BIGINT DEFAULT 0,
-
-    -- Record metrics
-    added_records BIGINT DEFAULT 0,
-    removed_records BIGINT DEFAULT 0,
-    total_records BIGINT DEFAULT 0,
-
-    -- Size metrics
-    added_file_size_bytes BIGINT DEFAULT 0,
-    removed_file_size_bytes BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Duration and attempts
-    total_duration_ms BIGINT DEFAULT 0,
-    attempts INTEGER DEFAULT 1,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE commit_metrics_report IS 'Commit metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
\ No newline at end of file
diff --git a/persistence/relational-jdbc/src/main/resources/postgres/schema-v6.sql b/persistence/relational-jdbc/src/main/resources/postgres/schema-v6.sql
deleted file mode 100644
index e5d1adb3ff..0000000000
--- a/persistence/relational-jdbc/src/main/resources/postgres/schema-v6.sql
+++ /dev/null
@@ -1,272 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
-
--- Changes from v5:
---  * `idx_locations` now leads with `catalog_id` instead of `parent_id`, matching the predicate in
---    QueryGenerator.generateOverlapQuery (WHERE realm_id = ? AND catalog_id = ?). The previous
---    definition let the optimized sibling check (OPTIMIZED_SIBLING_CHECK) use only the realm_id
---    prefix, degrading CREATE TABLE / CREATE NAMESPACE to a realm-wide scan.
-
-CREATE TABLE IF NOT EXISTS version (
-    version_key TEXT PRIMARY KEY,
-    version_value INTEGER NOT NULL
-);
-INSERT INTO version (version_key, version_value)
-VALUES ('version', 6)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
-
-CREATE TABLE IF NOT EXISTS entities (
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    id BIGINT NOT NULL,
-    parent_id BIGINT NOT NULL,
-    name TEXT NOT NULL,
-    entity_version INT NOT NULL,
-    type_code INT NOT NULL,
-    sub_type_code INT NOT NULL,
-    create_timestamp BIGINT NOT NULL,
-    drop_timestamp BIGINT NOT NULL,
-    purge_timestamp BIGINT NOT NULL,
-    to_purge_timestamp BIGINT NOT NULL,
-    last_update_timestamp BIGINT NOT NULL,
-    properties JSONB not null default '{}'::JSONB,
-    internal_properties JSONB not null default '{}'::JSONB,
-    grant_records_version INT NOT NULL,
-    location_without_scheme TEXT,
-    PRIMARY KEY (realm_id, id),
-    CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
-CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, catalog_id, location_without_scheme)
-    WHERE location_without_scheme IS NOT NULL;
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.realm_id IS 'realm_id used for multi-tenancy';
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee 
-    ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable 
-    ON grant_records (realm_id, securable_id);
-
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
-
-CREATE TABLE IF NOT EXISTS events (
-    realm_id TEXT NOT NULL,
-    catalog_id TEXT,
-    event_id TEXT NOT NULL,
-    request_id TEXT,
-    event_type TEXT NOT NULL,
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    resource_type TEXT NOT NULL,
-    resource_identifier TEXT NOT NULL,
-    additional_properties JSONB NOT NULL DEFAULT '{}'::JSONB,
-    PRIMARY KEY (event_id)
-);
-
--- ============================================================================
--- SCAN METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS scan_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Scan context
-    snapshot_id BIGINT,
-    schema_id INTEGER,
-    filter_expression TEXT,
-    projected_field_ids TEXT,
-    projected_field_names TEXT,
-
-    -- Scan metrics
-    result_data_files BIGINT DEFAULT 0,
-    result_delete_files BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-    total_data_manifests BIGINT DEFAULT 0,
-    total_delete_manifests BIGINT DEFAULT 0,
-    scanned_data_manifests BIGINT DEFAULT 0,
-    scanned_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_manifests BIGINT DEFAULT 0,
-    skipped_delete_manifests BIGINT DEFAULT 0,
-    skipped_data_files BIGINT DEFAULT 0,
-    skipped_delete_files BIGINT DEFAULT 0,
-    total_planning_duration_ms BIGINT DEFAULT 0,
-
-    -- Equality/positional delete metrics
-    equality_delete_files BIGINT DEFAULT 0,
-    positional_delete_files BIGINT DEFAULT 0,
-    indexed_delete_files BIGINT DEFAULT 0,
-    total_delete_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE scan_metrics_report IS 'Scan metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_scan_report_timestamp ON scan_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_scan_report_lookup ON scan_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
-
--- ============================================================================
--- COMMIT METRICS REPORT TABLE
--- ============================================================================
-
-CREATE TABLE IF NOT EXISTS commit_metrics_report (
-    report_id TEXT NOT NULL,
-    realm_id TEXT NOT NULL,
-    catalog_id BIGINT NOT NULL,
-    table_id BIGINT NOT NULL,
-
-    -- Report metadata
-    timestamp_ms BIGINT NOT NULL,
-    principal_name TEXT,
-    request_id TEXT,
-
-    -- Trace correlation
-    otel_trace_id TEXT,
-    otel_span_id TEXT,
-    report_trace_id TEXT,
-
-    -- Commit context
-    snapshot_id BIGINT NOT NULL,
-    sequence_number BIGINT,
-    operation TEXT NOT NULL,
-
-    -- File metrics
-    added_data_files BIGINT DEFAULT 0,
-    removed_data_files BIGINT DEFAULT 0,
-    total_data_files BIGINT DEFAULT 0,
-    added_delete_files BIGINT DEFAULT 0,
-    removed_delete_files BIGINT DEFAULT 0,
-    total_delete_files BIGINT DEFAULT 0,
-
-    -- Equality delete files
-    added_equality_delete_files BIGINT DEFAULT 0,
-    removed_equality_delete_files BIGINT DEFAULT 0,
-
-    -- Positional delete files
-    added_positional_delete_files BIGINT DEFAULT 0,
-    removed_positional_delete_files BIGINT DEFAULT 0,
-
-    -- Record metrics
-    added_records BIGINT DEFAULT 0,
-    removed_records BIGINT DEFAULT 0,
-    total_records BIGINT DEFAULT 0,
-
-    -- Size metrics
-    added_file_size_bytes BIGINT DEFAULT 0,
-    removed_file_size_bytes BIGINT DEFAULT 0,
-    total_file_size_bytes BIGINT DEFAULT 0,
-
-    -- Duration and attempts
-    total_duration_ms BIGINT DEFAULT 0,
-    attempts INTEGER DEFAULT 1,
-
-    -- Additional metadata (for extensibility)
-    metadata JSONB DEFAULT '{}'::JSONB,
-
-    PRIMARY KEY (realm_id, report_id)
-);
-
-COMMENT ON TABLE commit_metrics_report IS 'Commit metrics reports as first-class entities';
-
--- Index for retention cleanup by timestamp
-CREATE INDEX IF NOT EXISTS idx_commit_report_timestamp ON commit_metrics_report(realm_id, timestamp_ms);
-
--- Index for query lookups by catalog_id and table_id
-CREATE INDEX IF NOT EXISTS idx_commit_report_lookup ON commit_metrics_report(realm_id, catalog_id, table_id, timestamp_ms);
diff --git a/persistence/relational-jdbc/src/main/resources/postgres/schema-v5.sql b/persistence/relational-jdbc/src/main/resources/postgres/schema.sql
similarity index 93%
rename from persistence/relational-jdbc/src/main/resources/postgres/schema-v5.sql
rename to persistence/relational-jdbc/src/main/resources/postgres/schema.sql
index 1348c0713b..47768960c8 100644
--- a/persistence/relational-jdbc/src/main/resources/postgres/schema-v5.sql
+++ b/persistence/relational-jdbc/src/main/resources/postgres/schema.sql
@@ -16,21 +16,14 @@
 -- specific language governing permissions and limitations
 -- under the License.
 
--- Changes from v4:
---  * Removed the `idempotency_records` table (the durable idempotency store it
---    backed was never wired into any request path and has been removed)
---  * `events.catalog_id` is nullable; events that are not catalog-scoped store NULL (issue #4674)
-
-
 CREATE TABLE IF NOT EXISTS version (
     version_key TEXT PRIMARY KEY,
     version_value INTEGER NOT NULL
 );
 INSERT INTO version (version_key, version_value)
-VALUES ('version', 5)
-ON CONFLICT (version_key) DO UPDATE
-SET version_value = EXCLUDED.version_value;
-COMMENT ON TABLE version IS 'the version of the JDBC schema in use';
+VALUES ('version', 6)
+ON CONFLICT (version_key) DO NOTHING;
+COMMENT ON TABLE version IS 'JDBC schema version; updated manually as part of upgrade procedures.';
 
 CREATE TABLE IF NOT EXISTS entities (
     realm_id TEXT NOT NULL,
@@ -58,7 +51,7 @@ CREATE TABLE IF NOT EXISTS entities (
 CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
 CREATE INDEX IF NOT EXISTS idx_entities_catalog_id_id ON entities (catalog_id, id);
 CREATE INDEX IF NOT EXISTS idx_locations
-    ON entities USING btree (realm_id, parent_id, location_without_scheme)
+    ON entities USING btree (realm_id, catalog_id, location_without_scheme)
     WHERE location_without_scheme IS NOT NULL;
 
 COMMENT ON TABLE entities IS 'all the entities';
@@ -97,9 +90,9 @@ COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee
 COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
 COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
 
-CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee 
+CREATE INDEX IF NOT EXISTS idx_grants_realm_grantee
     ON grant_records (realm_id, grantee_id);
-CREATE INDEX IF NOT EXISTS idx_grants_realm_securable 
+CREATE INDEX IF NOT EXISTS idx_grants_realm_securable
     ON grant_records (realm_id, securable_id);
 
 CREATE TABLE IF NOT EXISTS principal_authentication_data (
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplPostgresSchemaIT.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplPostgresSchemaIT.java
index 939fc9dfb1..af22821c07 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplPostgresSchemaIT.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplPostgresSchemaIT.java
@@ -24,12 +24,8 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.stream.Stream;
 import javax.sql.DataSource;
 import org.apache.polaris.test.commons.PostgresRelationalJdbcLifeCycleManagement;
-import org.junit.jupiter.params.Parameter;
-import org.junit.jupiter.params.ParameterizedClass;
-import org.junit.jupiter.params.provider.MethodSource;
 import org.postgresql.ds.PGSimpleDataSource;
 import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
@@ -37,11 +33,9 @@ import org.testcontainers.postgresql.PostgreSQLContainer;
 
 /**
  * Runs {@link org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest} integration
- * tests against every PostgreSQL schema version on the classpath.
+ * tests against PostgreSQL.
  */
 @Testcontainers
-@ParameterizedClass
-@MethodSource("schemaVersions")
 public class AtomicMetastoreManagerWithJdbcBasePersistenceImplPostgresSchemaIT
     extends AtomicMetastoreManagerWithJdbcBasePersistenceImplTest {
 
@@ -52,34 +46,23 @@ public class AtomicMetastoreManagerWithJdbcBasePersistenceImplPostgresSchemaIT
               .dockerImageName(null)
               .asCompatibleSubstituteFor("postgres"));
 
-  @Parameter int schemaVersion;
-
   private DataSource dataSource;
 
-  static Stream<Integer> schemaVersions() {
-    return SchemaVersions.discoverAsStream(DatabaseType.POSTGRES);
-  }
-
   @Override
   protected DatabaseType databaseType() {
     return DatabaseType.POSTGRES;
   }
 
-  @Override
-  public int schemaVersion() {
-    return schemaVersion;
-  }
-
   @Override
   protected DataSource createDataSource() {
     if (dataSource == null) {
-      dataSource = createPostgresDataSource(schemaVersion());
+      dataSource = createPostgresDataSource();
     }
     return dataSource;
   }
 
-  private static DataSource createPostgresDataSource(int schemaVersion) {
-    String databaseName = "polaris_schema_v" + schemaVersion;
+  private static DataSource createPostgresDataSource() {
+    String databaseName = "polaris_schema";
     createDatabaseIfNotExists(databaseName);
     createPolarisSchema(databaseName);
 
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java
index 28371e0f81..7f4d2e4164 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/AtomicMetastoreManagerWithJdbcBasePersistenceImplTest.java
@@ -41,7 +41,6 @@ import org.apache.polaris.core.persistence.AtomicOperationMetaStoreManager;
 import org.apache.polaris.core.persistence.BasePolarisMetaStoreManagerTest;
 import org.apache.polaris.core.persistence.PolarisTestMetaStoreManager;
 import org.assertj.core.api.Assertions;
-import org.assertj.core.api.Assumptions;
 import org.h2.jdbcx.JdbcConnectionPool;
 import org.junit.jupiter.api.Test;
 
@@ -52,30 +51,21 @@ public abstract class AtomicMetastoreManagerWithJdbcBasePersistenceImplTest
     return DatabaseType.H2;
   }
 
-  public abstract int schemaVersion();
-
   protected DataSource createDataSource() {
     // The schema is provided by the datasource, not by the persistence code: INIT creates the
     // schema (the DBA step in a real deployment) and selects it as the session schema on every
     // connection (the currentSchema/SCHEMA driver setting in a real deployment).
     return JdbcConnectionPool.create(
         String.format(
-            "jdbc:h2:file:./build/test_data/polaris/db_%s_%d"
+            "jdbc:h2:file:./build/test_data/polaris/db_%s"
                 + ";INIT=CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA\\;SET SCHEMA POLARIS_SCHEMA",
-            databaseType().getDisplayName(), schemaVersion()),
+            databaseType().getDisplayName()),
         "sa",
         "");
   }
 
   protected InputStream openSchemaScript() {
-    ClassLoader classLoader = DatasourceOperations.class.getClassLoader();
-    String resource =
-        String.format("%s/schema-v%d.sql", databaseType().getDisplayName(), schemaVersion());
-    InputStream scriptStream = classLoader.getResourceAsStream(resource);
-    if (scriptStream == null) {
-      throw new IllegalStateException("Schema resource not found: " + resource);
-    }
-    return scriptStream;
+    return databaseType().openInitScriptResource();
   }
 
   @Override
@@ -92,20 +82,13 @@ public abstract class AtomicMetastoreManagerWithJdbcBasePersistenceImplTest
       }
     } catch (SQLException | IOException e) {
       throw new RuntimeException(
-          String.format(
-              "Error executing %s schema-v%d script: %s",
-              databaseType(), schemaVersion(), e.getMessage()),
-          e);
+          String.format("Error executing %s schema script: %s", databaseType(), e.getMessage()), e);
     }
 
     RealmContext realmContext = () -> "REALM";
     JdbcBasePersistenceImpl basePersistence =
         new JdbcBasePersistenceImpl(
-            diagServices,
-            datasourceOperations,
-            RANDOM_SECRETS,
-            realmContext.getRealmIdentifier(),
-            schemaVersion());
+            diagServices, datasourceOperations, RANDOM_SECRETS, realmContext.getRealmIdentifier());
     AtomicOperationMetaStoreManager metaStoreManager =
         new AtomicOperationMetaStoreManager(clock, diagServices);
     PolarisCallContext callCtx = new PolarisCallContext(realmContext, basePersistence);
@@ -114,9 +97,6 @@ public abstract class AtomicMetastoreManagerWithJdbcBasePersistenceImplTest
 
   @Test
   void testHasOverlappingSiblingsUsesStoredBaseLocation() {
-    // The optimized check relies on the location_without_scheme column added in schema v2.
-    Assumptions.assumeThat(schemaVersion()).isGreaterThanOrEqualTo(2);
-
     var metaStoreManager = polarisTestMetaStoreManager.polarisMetaStoreManager();
     var callContext = polarisTestMetaStoreManager.polarisCallContext();
     PolarisBaseEntity catalog =
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsSchemaTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsSchemaTest.java
index 513cfbc67b..a5952f2495 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsSchemaTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsSchemaTest.java
@@ -19,12 +19,15 @@
 package org.apache.polaris.persistence.relational.jdbc;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.util.UUID;
 import javax.sql.DataSource;
 import org.h2.jdbcx.JdbcConnectionPool;
@@ -52,7 +55,7 @@ class DatasourceOperationsSchemaTest {
    * exercising the invariant that the latest bootstrap path selects no schema of its own.
    */
   private static InputStream openSchemaScript() {
-    return DatabaseType.H2.openInitScriptResource(DatabaseType.H2.getLatestSchemaVersion());
+    return DatabaseType.H2.openInitScriptResource();
   }
 
   /** The schema holding the ENTITIES table, as reported by the database catalog. */
@@ -74,13 +77,15 @@ class DatasourceOperationsSchemaTest {
         new DatasourceOperations(
             dataSource, SimpleRelationalJdbcConfiguration.forDatabaseType(DatabaseType.H2));
 
-    assertThat(JdbcBasePersistenceImpl.entityTableExists(ops)).isFalse();
+    assertThatThrownBy(ops::validateSchemaCompatibility)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Version table not found");
 
     ops.executeScript(openSchemaScript());
 
     // Unqualified queries resolve against the schema selected by the datasource.
-    assertThat(JdbcBasePersistenceImpl.loadSchemaVersion(ops, false))
-        .isEqualTo(DatabaseType.H2.getLatestSchemaVersion());
+    assertThatCode(ops::validateSchemaCompatibility).doesNotThrowAnyException();
+
     // H2 case-folds the unquoted identifier to uppercase.
     assertThat(schemaContainingEntitiesTable(dataSource)).isEqualTo("CUSTOM_POLARIS");
   }
@@ -92,13 +97,79 @@ class DatasourceOperationsSchemaTest {
         new DatasourceOperations(
             dataSource, SimpleRelationalJdbcConfiguration.forDatabaseType(DatabaseType.H2));
 
-    assertThat(JdbcBasePersistenceImpl.entityTableExists(ops)).isFalse();
+    assertThatThrownBy(ops::validateSchemaCompatibility)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Version table not found");
 
     ops.executeScript(openSchemaScript());
 
-    assertThat(JdbcBasePersistenceImpl.loadSchemaVersion(ops, false))
-        .isEqualTo(DatabaseType.H2.getLatestSchemaVersion());
+    assertThatCode(ops::validateSchemaCompatibility).doesNotThrowAnyException();
+
     // Without a datasource-selected schema, tables land in the database's default schema.
     assertThat(schemaContainingEntitiesTable(dataSource)).isEqualTo("PUBLIC");
   }
+
+  @Test
+  void validateSchemaCompatibility_throwsOnOlderVersion() throws SQLException {
+    DataSource dataSource = createDataSource(null);
+    DatasourceOperations ops =
+        new DatasourceOperations(
+            dataSource, SimpleRelationalJdbcConfiguration.forDatabaseType(DatabaseType.H2));
+    ops.executeScript(openSchemaScript());
+
+    int staleVersion = DatasourceOperations.CURRENT_SCHEMA_VERSION - 1;
+    try (Connection connection = dataSource.getConnection();
+        PreparedStatement statement =
+            connection.prepareStatement(
+                "UPDATE VERSION SET version_value = ? WHERE version_key = 'version'")) {
+      statement.setInt(1, staleVersion);
+      statement.executeUpdate();
+    }
+
+    assertThatThrownBy(ops::validateSchemaCompatibility)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Incompatible JDBC schema version " + staleVersion)
+        .hasMessageContaining("expected " + DatasourceOperations.CURRENT_SCHEMA_VERSION);
+  }
+
+  @Test
+  void validateSchemaCompatibility_throwsOnNewerVersion() throws SQLException {
+    DataSource dataSource = createDataSource(null);
+    DatasourceOperations ops =
+        new DatasourceOperations(
+            dataSource, SimpleRelationalJdbcConfiguration.forDatabaseType(DatabaseType.H2));
+    ops.executeScript(openSchemaScript());
+
+    int futureVersion = DatasourceOperations.CURRENT_SCHEMA_VERSION + 1;
+    try (Connection connection = dataSource.getConnection();
+        PreparedStatement statement =
+            connection.prepareStatement(
+                "UPDATE VERSION SET version_value = ? WHERE version_key = 'version'")) {
+      statement.setInt(1, futureVersion);
+      statement.executeUpdate();
+    }
+
+    assertThatThrownBy(ops::validateSchemaCompatibility)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Incompatible JDBC schema version " + futureVersion)
+        .hasMessageContaining("expected " + DatasourceOperations.CURRENT_SCHEMA_VERSION);
+  }
+
+  @Test
+  void validateSchemaCompatibility_throwsWhenVersionTableIsEmpty() throws SQLException {
+    DataSource dataSource = createDataSource(null);
+    DatasourceOperations ops =
+        new DatasourceOperations(
+            dataSource, SimpleRelationalJdbcConfiguration.forDatabaseType(DatabaseType.H2));
+    ops.executeScript(openSchemaScript());
+
+    try (Connection connection = dataSource.getConnection();
+        Statement statement = connection.createStatement()) {
+      statement.execute("DELETE FROM VERSION");
+    }
+
+    assertThatThrownBy(ops::validateSchemaCompatibility)
+        .isInstanceOf(IllegalStateException.class)
+        .hasMessageContaining("Version table exists but contains no rows");
+  }
 }
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsTest.java
index 83d733ca97..f1cbef6882 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/DatasourceOperationsTest.java
@@ -109,7 +109,7 @@ public class DatasourceOperationsTest {
     // `executeBatch` is being called
     when(mockDataSource.getConnection()).thenReturn(mockConnection);
     String sql =
-        "INSERT INTO POLARIS_SCHEMA.EVENTS (catalog_id, event_id, request_id, event_type, timestamp_ms, principal_name, resource_type, resource_identifier, additional_properties, realm_id) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
+        "INSERT INTO EVENTS (catalog_id, event_id, request_id, event_type, timestamp_ms, principal_name, resource_type, resource_identifier, additional_properties, realm_id) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ?, ? )";
     List<List<Object>> queryParams = new ArrayList<>();
     for (int i = 0; i < 1000; i++) {
       ModelEvent modelEvent =
@@ -147,7 +147,7 @@ public class DatasourceOperationsTest {
     when(mockPreparedStatement.executeQuery()).thenThrow(new SQLException("demo", "42P07"));
 
     assertThrows(
-        SQLException.class, () -> datasourceOperations.executeSelect(query, new ModelEntity(1)));
+        SQLException.class, () -> datasourceOperations.executeSelect(query, new ModelEntity()));
   }
 
   @Test
@@ -202,7 +202,7 @@ public class DatasourceOperationsTest {
     // (no internal borrow should occur for the SELECT itself).
     assertThrows(
         SQLException.class,
-        () -> datasourceOperations.executeSelect(mockConnection, query, new ModelEntity(1)));
+        () -> datasourceOperations.executeSelect(mockConnection, query, new ModelEntity()));
 
     verify(mockConnection).prepareStatement(query.sql());
   }
@@ -218,7 +218,7 @@ public class DatasourceOperationsTest {
         SQLException.class,
         () ->
             datasourceOperations.executeSelectOverStream(
-                mockConnection, query, new ModelEntity(1), stream -> stream.forEach(x -> {})));
+                mockConnection, query, new ModelEntity(), stream -> stream.forEach(x -> {})));
 
     verify(mockConnection).prepareStatement(query.sql());
   }
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImplTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImplTest.java
index 885b97df53..68e103cd9b 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImplTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBasePersistenceImplTest.java
@@ -75,21 +75,14 @@ class JdbcBasePersistenceImplTest {
   private static final long POLICY_CATALOG_ID = 13L;
   private static final long POLICY_ID = 14L;
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2, 3, 4, 5})
-  void writeToGrantRecordsIsIdempotent(int schemaVersion) throws SQLException {
+  @Test
+  void writeToGrantRecordsIsIdempotent() throws SQLException {
     JdbcConnectionPool dataSource =
         JdbcConnectionPool.create(
-            "jdbc:h2:mem:grant_idempotency_v"
-                + schemaVersion
-                + "_"
-                + System.nanoTime()
-                + ";DB_CLOSE_DELAY=-1",
-            "sa",
-            "");
+            "jdbc:h2:mem:grant_idempotency_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1", "sa", "");
     DatasourceOperations datasourceOperations =
         new DatasourceOperations(dataSource, new TestJdbcConfiguration());
-    try (InputStream scriptStream = DatabaseType.H2.openInitScriptResource(schemaVersion)) {
+    try (InputStream scriptStream = DatabaseType.H2.openInitScriptResource()) {
       datasourceOperations.executeScript(scriptStream);
     } catch (IOException e) {
       throw new RuntimeException(e);
@@ -100,8 +93,7 @@ class JdbcBasePersistenceImplTest {
             new PolarisDefaultDiagServiceImpl(),
             datasourceOperations,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, basePersistence);
 
     PolarisGrantRecord grant =
@@ -136,14 +128,12 @@ class JdbcBasePersistenceImplTest {
         .when(datasourceOperations)
         .isUniquenessConstraintViolation(any(SQLException.class));
 
-    int schemaVersion = 4;
     JdbcBasePersistenceImpl basePersistence =
         new JdbcBasePersistenceImpl(
             new PolarisDefaultDiagServiceImpl(),
             datasourceOperations,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, basePersistence);
 
     PolarisGrantRecord grant =
@@ -156,10 +146,9 @@ class JdbcBasePersistenceImplTest {
         .withCause(nonUniqueViolation);
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2, 3, 4})
-  void writeEntity_uniquenessViolationWithInvisibleConflict_throwsRetryOnConcurrencyException(
-      int schemaVersion) throws SQLException {
+  @Test
+  void writeEntity_uniquenessViolationWithInvisibleConflict_throwsRetryOnConcurrencyException()
+      throws SQLException {
     DatasourceOperations datasourceOperations = Mockito.mock(DatasourceOperations.class);
     when(datasourceOperations.getDatabaseType()).thenReturn(DatabaseType.H2);
     doThrow(new SQLException("Unique constraint violation", "23505"))
@@ -175,8 +164,7 @@ class JdbcBasePersistenceImplTest {
             new PolarisDefaultDiagServiceImpl(),
             datasourceOperations,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, basePersistence);
 
     PolarisBaseEntity entity =
@@ -238,15 +226,13 @@ class JdbcBasePersistenceImplTest {
         .isSameAs(expected);
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2})
-  void lookupEntityVersionsPreservesOrderAndNullsForMissing(int schemaVersion)
-      throws SQLException, IOException {
-    DatasourceOperations real = newH2DatasourceOperations("lookup_versions_v", schemaVersion);
+  @Test
+  void lookupEntityVersionsPreservesOrderAndNullsForMissing() throws SQLException, IOException {
+    DatasourceOperations real = newH2DatasourceOperations("lookup_versions");
     // Spy so we can assert on the SQL actually issued, without blocking the real call.
     DatasourceOperations spy = Mockito.spy(real);
     doCallRealMethod().when(spy).executeSelect(any(), any());
-    TestPersistence tp = newTestPersistence(spy, schemaVersion);
+    TestPersistence tp = newTestPersistence(spy);
     JdbcBasePersistenceImpl impl = tp.impl();
     PolarisCallContext callCtx = tp.callCtx();
 
@@ -276,20 +262,13 @@ class JdbcBasePersistenceImplTest {
     assertThat(captor.getValue().sql()).doesNotContain("properties");
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2})
-  void hasChildrenUsesExistsQueryNotFullScan(int schemaVersion) throws SQLException, IOException {
+  @Test
+  void hasChildrenUsesExistsQueryNotFullScan() throws SQLException, IOException {
     JdbcConnectionPool dataSource =
         JdbcConnectionPool.create(
-            "jdbc:h2:mem:has_children_v"
-                + schemaVersion
-                + "_"
-                + System.nanoTime()
-                + ";DB_CLOSE_DELAY=-1",
-            "sa",
-            "");
+            "jdbc:h2:mem:has_children_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1", "sa", "");
     DatasourceOperations real = new DatasourceOperations(dataSource, new TestJdbcConfiguration());
-    try (InputStream script = DatabaseType.H2.openInitScriptResource(schemaVersion)) {
+    try (InputStream script = DatabaseType.H2.openInitScriptResource()) {
       real.executeScript(script);
     }
     DatasourceOperations spy = Mockito.spy(real);
@@ -300,8 +279,7 @@ class JdbcBasePersistenceImplTest {
             new PolarisDefaultDiagServiceImpl(),
             spy,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, impl);
 
     impl.hasChildren(callCtx, null, 0L, 0L);
@@ -315,16 +293,14 @@ class JdbcBasePersistenceImplTest {
     assertThat(sql).doesNotContain("internal_properties");
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2})
-  void lookupEntityGrantRecordsVersionDelegatesToLookupEntityVersions(int schemaVersion)
+  @Test
+  void lookupEntityGrantRecordsVersionDelegatesToLookupEntityVersions()
       throws SQLException, IOException {
     // lookupEntityGrantRecordsVersion delegates to lookupEntityVersions, whose SQL shape (and the
     // exclusion of large property columns) is already covered by the test above; this test only
     // needs to check the delegation's own behavioural contract.
-    DatasourceOperations datasourceOperations =
-        newH2DatasourceOperations("lookup_grant_version_v", schemaVersion);
-    TestPersistence tp = newTestPersistence(datasourceOperations, schemaVersion);
+    DatasourceOperations datasourceOperations = newH2DatasourceOperations("lookup_grant_version");
+    TestPersistence tp = newTestPersistence(datasourceOperations);
     JdbcBasePersistenceImpl impl = tp.impl();
     PolarisCallContext callCtx = tp.callCtx();
 
@@ -345,13 +321,11 @@ class JdbcBasePersistenceImplTest {
    * re-attach that rewrites the parameters in between leaves the caller holding a record whose
    * parameters no longer match the stored row. The delete must still remove that row.
    */
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2, 3, 4, 5})
-  void deleteFromPolicyMappingRecordsIgnoresConcurrentParametersUpdate(int schemaVersion)
+  @Test
+  void deleteFromPolicyMappingRecordsIgnoresConcurrentParametersUpdate()
       throws SQLException, IOException {
-    DatasourceOperations datasourceOperations =
-        newH2DatasourceOperations("policy_mapping_delete_v", schemaVersion);
-    TestPersistence tp = newTestPersistence(datasourceOperations, schemaVersion);
+    DatasourceOperations datasourceOperations = newH2DatasourceOperations("policy_mapping_delete");
+    TestPersistence tp = newTestPersistence(datasourceOperations);
     JdbcBasePersistenceImpl impl = tp.impl();
     PolarisCallContext callCtx = tp.callCtx();
 
@@ -399,35 +373,28 @@ class JdbcBasePersistenceImplTest {
         parameters);
   }
 
-  private static DatasourceOperations newH2DatasourceOperations(
-      String dbNamePrefix, int schemaVersion) throws SQLException, IOException {
+  private static DatasourceOperations newH2DatasourceOperations(String dbNamePrefix)
+      throws SQLException, IOException {
     JdbcConnectionPool dataSource =
         JdbcConnectionPool.create(
-            "jdbc:h2:mem:"
-                + dbNamePrefix
-                + schemaVersion
-                + "_"
-                + System.nanoTime()
-                + ";DB_CLOSE_DELAY=-1",
+            "jdbc:h2:mem:" + dbNamePrefix + "_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1",
             "sa",
             "");
     DatasourceOperations operations =
         new DatasourceOperations(dataSource, new TestJdbcConfiguration());
-    try (InputStream script = DatabaseType.H2.openInitScriptResource(schemaVersion)) {
+    try (InputStream script = DatabaseType.H2.openInitScriptResource()) {
       operations.executeScript(script);
     }
     return operations;
   }
 
-  private static TestPersistence newTestPersistence(
-      DatasourceOperations datasourceOperations, int schemaVersion) {
+  private static TestPersistence newTestPersistence(DatasourceOperations datasourceOperations) {
     JdbcBasePersistenceImpl impl =
         new JdbcBasePersistenceImpl(
             new PolarisDefaultDiagServiceImpl(),
             datasourceOperations,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     return new TestPersistence(impl, new PolarisCallContext(REALM_CONTEXT, impl));
   }
 
@@ -455,18 +422,13 @@ class JdbcBasePersistenceImplTest {
    */
   @Test
   void writeEntitiesCreatePathUsesExistsCheckNotFullRowFetch() throws SQLException, IOException {
-    int schemaVersion = 5;
     JdbcConnectionPool dataSource =
         JdbcConnectionPool.create(
-            "jdbc:h2:mem:write_entities_create_v"
-                + schemaVersion
-                + "_"
-                + System.nanoTime()
-                + ";DB_CLOSE_DELAY=-1",
+            "jdbc:h2:mem:write_entities_create_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1",
             "sa",
             "");
     DatasourceOperations real = new DatasourceOperations(dataSource, new TestJdbcConfiguration());
-    try (InputStream script = DatabaseType.H2.openInitScriptResource(schemaVersion)) {
+    try (InputStream script = DatabaseType.H2.openInitScriptResource()) {
       real.executeScript(script);
     }
     DatasourceOperations spy = Mockito.spy(real);
@@ -476,8 +438,7 @@ class JdbcBasePersistenceImplTest {
             new PolarisDefaultDiagServiceImpl(),
             spy,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, impl);
 
     PolarisBaseEntity entity = principalEntity(1L, "create-me", 1);
@@ -508,18 +469,13 @@ class JdbcBasePersistenceImplTest {
    */
   @Test
   void writeEntitiesUpdatePathSkipsExistenceLookup() throws SQLException, IOException {
-    int schemaVersion = 5;
     JdbcConnectionPool dataSource =
         JdbcConnectionPool.create(
-            "jdbc:h2:mem:write_entities_update_v"
-                + schemaVersion
-                + "_"
-                + System.nanoTime()
-                + ";DB_CLOSE_DELAY=-1",
+            "jdbc:h2:mem:write_entities_update_" + System.nanoTime() + ";DB_CLOSE_DELAY=-1",
             "sa",
             "");
     DatasourceOperations real = new DatasourceOperations(dataSource, new TestJdbcConfiguration());
-    try (InputStream script = DatabaseType.H2.openInitScriptResource(schemaVersion)) {
+    try (InputStream script = DatabaseType.H2.openInitScriptResource()) {
       real.executeScript(script);
     }
     DatasourceOperations spy = Mockito.spy(real);
@@ -529,8 +485,7 @@ class JdbcBasePersistenceImplTest {
             new PolarisDefaultDiagServiceImpl(),
             spy,
             RANDOM_SECRETS,
-            REALM_CONTEXT.getRealmIdentifier(),
-            schemaVersion);
+            REALM_CONTEXT.getRealmIdentifier());
     PolarisCallContext callCtx = new PolarisCallContext(REALM_CONTEXT, impl);
 
     PolarisBaseEntity original = principalEntity(1L, "update-me", 1);
@@ -588,14 +543,12 @@ class JdbcBasePersistenceImplTest {
     }
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2})
-  void listEntitiesBoundsPaginatedQueryByPageSize(int schemaVersion)
-      throws SQLException, IOException {
-    DatasourceOperations real = newH2DatasourceOperations("list_entities_limit_v", schemaVersion);
+  @Test
+  void listEntitiesBoundsPaginatedQueryByPageSize() throws SQLException, IOException {
+    DatasourceOperations real = newH2DatasourceOperations("list_entities_limit");
     DatasourceOperations spy = Mockito.spy(real);
     doCallRealMethod().when(spy).executeSelectOverStream(any(), any(), any());
-    TestPersistence tp = newTestPersistence(spy, schemaVersion);
+    TestPersistence tp = newTestPersistence(spy);
     JdbcBasePersistenceImpl impl = tp.impl();
     PolarisCallContext callCtx = tp.callCtx();
 
@@ -623,13 +576,11 @@ class JdbcBasePersistenceImplTest {
     assertThat(page.encodedResponseToken()).isNotNull();
   }
 
-  @ParameterizedTest
-  @ValueSource(ints = {1, 2})
-  void paginatedListEntitiesWalksEveryPageWhenTotalIsAMultipleOfPageSize(int schemaVersion)
+  @Test
+  void paginatedListEntitiesWalksEveryPageWhenTotalIsAMultipleOfPageSize()
       throws SQLException, IOException {
-    DatasourceOperations datasourceOperations =
-        newH2DatasourceOperations("list_entities_pages_v", schemaVersion);
-    TestPersistence tp = newTestPersistence(datasourceOperations, schemaVersion);
+    DatasourceOperations datasourceOperations = newH2DatasourceOperations("list_entities_pages");
+    TestPersistence tp = newTestPersistence(datasourceOperations);
     JdbcBasePersistenceImpl impl = tp.impl();
     PolarisCallContext callCtx = tp.callCtx();
 
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBootstrapUtilsTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBootstrapUtilsTest.java
deleted file mode 100644
index a2ba435129..0000000000
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcBootstrapUtilsTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.polaris.persistence.relational.jdbc;
-
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.when;
-
-import java.util.Optional;
-import org.apache.polaris.core.persistence.bootstrap.BootstrapOptions;
-import org.apache.polaris.core.persistence.bootstrap.SchemaOptions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Nested;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.CsvSource;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-class JdbcBootstrapUtilsTest {
-
-  @Test
-  void getVersion_whenVersionsMatch() {
-    // Arrange
-    int version = 2;
-
-    // Act & Assert
-    assertEquals(
-        version,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, version, version, true));
-    assertEquals(
-        version,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, version, version, false));
-  }
-
-  @Test
-  void getVersion_whenFreshDbAndNoRealms() {
-    // Arrange
-    int currentVersion = 0;
-    boolean hasRealms = false;
-
-    // Act & Assert
-    assertEquals(
-        6,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, currentVersion, -1, hasRealms));
-    assertEquals(
-        2,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, currentVersion, 2, hasRealms));
-    assertEquals(
-        3,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, currentVersion, 3, hasRealms));
-  }
-
-  @Test
-  void getVersion_whenFreshDbAndRealmsExist() {
-    // Arrange
-    int currentVersion = 0;
-    boolean hasRealms = true;
-
-    // Act & Assert
-    assertEquals(
-        1,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, currentVersion, -1, hasRealms));
-    assertEquals(
-        1,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, currentVersion, 1, hasRealms));
-  }
-
-  @ParameterizedTest
-  @CsvSource({
-    "2, true, 2",
-    "3, true, 3",
-    "4, true, 4",
-    "5, true, 5",
-    "6, true, 6",
-    "2, false, 6",
-    "3, false, 6",
-    "4, false, 6",
-    "5, false, 6",
-    "6, false, 6"
-  })
-  void getVersion_whenExistingDbAndAutoDetect(
-      int currentVersion, boolean hasRealms, int expectedVersion) {
-    // Act & Assert
-    assertEquals(
-        expectedVersion,
-        JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-            DatabaseType.POSTGRES, currentVersion, -1, hasRealms));
-  }
-
-  @Test
-  void throwException_whenFreshDbWithRealmsAndInvalidRequiredVersion() {
-    // Arrange
-    int currentVersion = 0;
-    boolean hasRealms = true;
-    int invalidRequiredVersion = 2;
-
-    // Act & Assert
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-                DatabaseType.POSTGRES, currentVersion, invalidRequiredVersion, hasRealms));
-  }
-
-  @Test
-  void throwException_whenExistingDbAndInvalidMigrationPath() {
-    // Arrange
-    int currentVersion = 2;
-    int requiredVersion = 3;
-
-    // Act & Assert
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-                DatabaseType.POSTGRES, currentVersion, requiredVersion, true));
-
-    assertThrows(
-        IllegalStateException.class,
-        () ->
-            JdbcBootstrapUtils.getRealmBootstrapSchemaVersion(
-                DatabaseType.POSTGRES, currentVersion, requiredVersion, false));
-  }
-
-  @Nested
-  @ExtendWith(MockitoExtension.class)
-  class GetRequestedSchemaVersionTests {
-
-    @Mock private BootstrapOptions mockBootstrapOptions;
-    @Mock private SchemaOptions mockSchemaOptions;
-
-    @BeforeEach
-    void setUp() {
-      when(mockBootstrapOptions.schemaOptions()).thenReturn(mockSchemaOptions);
-    }
-
-    @ParameterizedTest
-    @CsvSource({"3", "2", "12"})
-    void whenVersionIsInFileName_shouldParseAndReturnIt(int expectedVersion) {
-      when(mockSchemaOptions.schemaVersion()).thenReturn(Optional.of(expectedVersion));
-
-      int result = JdbcBootstrapUtils.getRequestedSchemaVersion(mockBootstrapOptions);
-      assertEquals(expectedVersion, result);
-    }
-
-    @Test
-    void whenSchemaOptionsIsNull_shouldReturnDefault() {
-      when(mockBootstrapOptions.schemaOptions()).thenReturn(null);
-      int result = JdbcBootstrapUtils.getRequestedSchemaVersion(mockBootstrapOptions);
-      assertEquals(-1, result);
-    }
-  }
-}
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcEventsPersistenceTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcEventsPersistenceTest.java
index d7df93c4a9..fb582366e0 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcEventsPersistenceTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/JdbcEventsPersistenceTest.java
@@ -28,31 +28,17 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.util.List;
 import java.util.UUID;
-import java.util.stream.Stream;
 import javax.sql.DataSource;
 import org.apache.polaris.core.PolarisDefaultDiagServiceImpl;
 import org.apache.polaris.core.entity.EventEntity;
 import org.apache.polaris.core.persistence.PrincipalSecretsGenerator;
-import org.apache.polaris.persistence.relational.jdbc.models.ModelEvent;
 import org.h2.jdbcx.JdbcConnectionPool;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.api.Test;
 
-/**
- * Tests event persistence across schema versions: schema versions before v5 declare
- * events.catalog_id NOT NULL, so realm-scoped events (null catalog id) must be stored with the
- * legacy sentinel; from v5 on they are stored as SQL NULL.
- */
 class JdbcEventsPersistenceTest {
 
-  static Stream<Integer> schemaVersions() {
-    // The events table exists from schema v3 on.
-    return SchemaVersions.discoverAsStream(DatabaseType.H2).filter(version -> version >= 3);
-  }
-
-  @ParameterizedTest
-  @MethodSource("schemaVersions")
-  void writeEventsStoresNullCatalogIdPerSchemaVersion(int schemaVersion) throws Exception {
+  @Test
+  void writeEventsStoresNullCatalogIdAsSqlNull() throws Exception {
     // The schema is provided by the datasource, not the persistence code: INIT creates
     // POLARIS_SCHEMA
     // and selects it on every connection (the DBA step + currentSchema driver setting in a real
@@ -68,7 +54,7 @@ class JdbcEventsPersistenceTest {
     DatasourceOperations datasourceOperations =
         new DatasourceOperations(
             dataSource, SimpleRelationalJdbcConfiguration.forDatabaseType(DatabaseType.H2));
-    try (InputStream schemaStream = DatabaseType.H2.openInitScriptResource(schemaVersion)) {
+    try (InputStream schemaStream = DatabaseType.H2.openInitScriptResource()) {
       datasourceOperations.executeScript(schemaStream);
     }
     JdbcBasePersistenceImpl persistence =
@@ -76,8 +62,7 @@ class JdbcEventsPersistenceTest {
             new PolarisDefaultDiagServiceImpl(),
             datasourceOperations,
             PrincipalSecretsGenerator.RANDOM_SECRETS,
-            "TEST_REALM",
-            schemaVersion);
+            "TEST_REALM");
 
     EventEntity realmScopedEvent =
         new EventEntity(
@@ -102,13 +87,7 @@ class JdbcEventsPersistenceTest {
 
     persistence.writeEvents(List.of(realmScopedEvent, catalogScopedEvent));
 
-    if (schemaVersion < 5) {
-      assertEquals(
-          ModelEvent.LEGACY_REALM_SCOPED_CATALOG_ID,
-          readStoredCatalogId(dataSource, "realm-event"));
-    } else {
-      assertNull(readStoredCatalogId(dataSource, "realm-event"));
-    }
+    assertNull(readStoredCatalogId(dataSource, "realm-event"));
     assertEquals("catalog-1", readStoredCatalogId(dataSource, "catalog-event"));
   }
 
@@ -116,8 +95,7 @@ class JdbcEventsPersistenceTest {
       throws Exception {
     try (Connection connection = dataSource.getConnection();
         PreparedStatement statement =
-            connection.prepareStatement(
-                "SELECT catalog_id FROM POLARIS_SCHEMA.EVENTS WHERE event_id = ?")) {
+            connection.prepareStatement("SELECT catalog_id FROM EVENTS WHERE event_id = ?")) {
       statement.setString(1, eventId);
       try (ResultSet resultSet = statement.executeQuery()) {
         assertTrue(resultSet.next());
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/QueryGeneratorTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/QueryGeneratorTest.java
index 2e8bbaf9d9..bbb3131338 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/QueryGeneratorTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/QueryGeneratorTest.java
@@ -46,7 +46,7 @@ public class QueryGeneratorTest {
   private static final String REALM_ID = "testRealm";
 
   @Test
-  void testGenerateSelectQuery_withMaQueryGeneratorpWhereClause() {
+  void testGenerateSelectQuery_withMapWhereClause() {
     Map<String, Object> whereClause = new HashMap<>();
     whereClause.put("name", "testEntity");
     whereClause.put("entity_version", 1);
@@ -55,7 +55,7 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateSelectQuery(
-                ModelEntity.getAllColumnNames(2), ModelEntity.TABLE_NAME, whereClause)
+                ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, whereClause)
             .sql());
   }
 
@@ -68,7 +68,7 @@ public class QueryGeneratorTest {
         "SELECT id, catalog_id, parent_id, type_code, name, entity_version, sub_type_code, create_timestamp, drop_timestamp, purge_timestamp, to_purge_timestamp, last_update_timestamp, properties, internal_properties, grant_records_version, location_without_scheme FROM ENTITIES WHERE catalog_id = ? AND parent_id = ? LIMIT 1";
     QueryGenerator.PreparedQuery query =
         QueryGenerator.generateSelectQuery(
-            ModelEntity.getAllColumnNames(2), ModelEntity.TABLE_NAME, whereClause, 1);
+            ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, whereClause, 1);
     assertEquals(expectedQuery, query.sql());
     Assertions.assertThat(query.parameters()).containsExactly(123L, 1L);
   }
@@ -81,7 +81,7 @@ public class QueryGeneratorTest {
             IllegalArgumentException.class,
             () ->
                 QueryGenerator.generateSelectQuery(
-                    ModelEntity.getAllColumnNames(2),
+                    ModelEntity.getAllColumnNames(),
                     ModelEntity.TABLE_NAME,
                     Map.of("catalog_id", 123L),
                     limit));
@@ -94,10 +94,11 @@ public class QueryGeneratorTest {
     when(entity.getId()).thenReturn(1L);
     when(entity.getCatalogId()).thenReturn(123L);
     String expectedQuery =
-        "DELETE FROM GRANT_RECORDS WHERE (\n"
-            + "    (grantee_id = ? AND grantee_catalog_id = ?) OR\n"
-            + "    (securable_id = ? AND securable_catalog_id = ?)\n"
-            + ") AND realm_id = ?";
+        """
+        DELETE FROM GRANT_RECORDS WHERE (
+            (grantee_id = ? AND grantee_catalog_id = ?) OR
+            (securable_id = ? AND securable_catalog_id = ?)
+        ) AND realm_id = ?""";
     assertEquals(
         expectedQuery,
         QueryGenerator.generateDeleteQueryForEntityGrantRecords(entity, REALM_ID).sql());
@@ -109,8 +110,7 @@ public class QueryGeneratorTest {
     String expectedQuery =
         "SELECT id, catalog_id, parent_id, type_code, name, entity_version, sub_type_code, create_timestamp, drop_timestamp, purge_timestamp, to_purge_timestamp, last_update_timestamp, properties, internal_properties, grant_records_version, location_without_scheme FROM ENTITIES WHERE (catalog_id, id) IN ((?, ?)) AND realm_id = ?";
     assertEquals(
-        expectedQuery,
-        QueryGenerator.generateSelectQueryWithEntityIds(REALM_ID, 2, entityIds).sql());
+        expectedQuery, QueryGenerator.generateSelectQueryWithEntityIds(REALM_ID, entityIds).sql());
   }
 
   @Test
@@ -120,8 +120,7 @@ public class QueryGeneratorTest {
     String expectedQuery =
         "SELECT id, catalog_id, parent_id, type_code, name, entity_version, sub_type_code, create_timestamp, drop_timestamp, purge_timestamp, to_purge_timestamp, last_update_timestamp, properties, internal_properties, grant_records_version, location_without_scheme FROM ENTITIES WHERE (catalog_id, id) IN ((?, ?), (?, ?)) AND realm_id = ?";
     assertEquals(
-        expectedQuery,
-        QueryGenerator.generateSelectQueryWithEntityIds(REALM_ID, 2, entityIds).sql());
+        expectedQuery, QueryGenerator.generateSelectQueryWithEntityIds(REALM_ID, entityIds).sql());
   }
 
   @Test
@@ -129,7 +128,7 @@ public class QueryGeneratorTest {
     List<PolarisEntityId> entityIds = Collections.emptyList();
     assertThrows(
         IllegalArgumentException.class,
-        () -> QueryGenerator.generateSelectQueryWithEntityIds(REALM_ID, 2, entityIds).sql());
+        () -> QueryGenerator.generateSelectQueryWithEntityIds(REALM_ID, entityIds).sql());
   }
 
   @Test
@@ -175,7 +174,7 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateInsertQuery(
-                ModelEntity.getAllColumnNames(2),
+                ModelEntity.getAllColumnNames(),
                 ModelEntity.TABLE_NAME,
                 entity.toMap(DatabaseType.H2).values().stream().toList(),
                 REALM_ID)
@@ -192,7 +191,7 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateUpdateQuery(
-                ModelEntity.getAllColumnNames(2),
+                ModelEntity.getAllColumnNames(),
                 ModelEntity.TABLE_NAME,
                 entity.toMap(DatabaseType.H2).values().stream().toList(),
                 whereClause)
@@ -209,7 +208,7 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateUpdateQuery(
-                ModelEntity.getAllColumnNames(2),
+                ModelEntity.getAllColumnNames(),
                 ModelEntity.TABLE_NAME,
                 entity.toMap(DatabaseType.H2).values().stream().toList(),
                 whereClause)
@@ -224,7 +223,7 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateDeleteQuery(
-                ModelEntity.getAllColumnNames(2), ModelEntity.TABLE_NAME, whereClause)
+                ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, whereClause)
             .sql());
   }
 
@@ -234,14 +233,13 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateDeleteQuery(
-                ModelEntity.getAllColumnNames(2), ModelEntity.TABLE_NAME, Map.of("name", "oldName"))
+                ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, Map.of("name", "oldName"))
             .sql());
   }
 
   @Test
   void testGenerateDeleteQuery_byObject() {
-    ModelEntity entityToDelete =
-        ModelEntity.builder().name("test").entityVersion(1).schemaVersion(2).build();
+    ModelEntity entityToDelete = ModelEntity.builder().name("test").entityVersion(1).build();
     Map<String, Object> objMap = entityToDelete.toMap(DatabaseType.H2);
     objMap.put("realm_id", REALM_ID);
     String expectedQuery =
@@ -249,7 +247,7 @@ public class QueryGeneratorTest {
     assertEquals(
         expectedQuery,
         QueryGenerator.generateDeleteQuery(
-                ModelEntity.getAllColumnNames(2), ModelEntity.TABLE_NAME, objMap)
+                ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, objMap)
             .sql());
   }
 
@@ -329,9 +327,9 @@ public class QueryGeneratorTest {
             + " OR location_without_scheme = ? OR location_without_scheme = ? OR location_without_scheme = ? OR"
             + " location_without_scheme = ? OR location_without_scheme = ? OR location_without_scheme = ? OR"
             + " location_without_scheme LIKE ? ESCAPE '\\')",
-        QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/tmp/location/").sql());
+        QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/tmp/location/").sql());
     Assertions.assertThatCollection(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/tmp/location/")
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/tmp/location/")
                 .parameters())
         .containsExactly(
             "realmId",
@@ -348,7 +346,7 @@ public class QueryGeneratorTest {
     // A location without a trailing slash produces the same prefix terms so that ancestors stored
     // in either form are matched.
     Assertions.assertThatCollection(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/tmp/location")
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/tmp/location")
                 .parameters())
         .containsExactly(
             "realmId",
@@ -371,9 +369,9 @@ public class QueryGeneratorTest {
             + " ENTITIES WHERE realm_id = ? AND catalog_id = ? AND (location_without_scheme = ?"
             + " OR location_without_scheme = ? OR location_without_scheme = ? OR location_without_scheme = ? OR"
             + " location_without_scheme = ? OR location_without_scheme = ? OR location_without_scheme LIKE ? ESCAPE '\\')",
-        QueryGenerator.generateOverlapQuery("realmId", 2, -123, "/tmp/location/").sql());
+        QueryGenerator.generateOverlapQuery("realmId", -123, "/tmp/location/").sql());
     Assertions.assertThatCollection(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "/tmp/location/").parameters())
+            QueryGenerator.generateOverlapQuery("realmId", -123, "/tmp/location/").parameters())
         .containsExactly(
             "realmId",
             -123L,
@@ -392,9 +390,9 @@ public class QueryGeneratorTest {
             + " FROM ENTITIES WHERE realm_id = ? AND catalog_id = ? AND (location_without_scheme = ?"
             + " OR location_without_scheme = ? OR location_without_scheme = ? OR location_without_scheme = ? OR"
             + " location_without_scheme = ? OR location_without_scheme LIKE ? ESCAPE '\\')",
-        QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://バケツ/\"loc.ation\"/").sql());
+        QueryGenerator.generateOverlapQuery("realmId", -123, "s3://バケツ/\"loc.ation\"/").sql());
     Assertions.assertThatCollection(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://バケツ/\"loc.ation\"/")
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://バケツ/\"loc.ation\"/")
                 .parameters())
         .containsExactly(
             "realmId",
@@ -413,20 +411,17 @@ public class QueryGeneratorTest {
     // so an ancestor stored at the bare scheme root s3:// (ALLOW_NAMESPACE_CUSTOM_LOCATION mode)
     // is still matched. Regression pair: namespace at "//" with a table under "//bucket/ns/t".
     Assertions.assertThat(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/ns/t/")
-                .parameters())
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/ns/t/").parameters())
         .contains("//")
         .doesNotContain("/");
     // Same without a trailing slash (prefix walk normalizes; slash-only skip is unchanged).
     Assertions.assertThat(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/ns/t")
-                .parameters())
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/ns/t").parameters())
         .contains("//")
         .doesNotContain("/");
     // file: locations: the "///" root and "//" are kept, but "/" is not emitted.
     Assertions.assertThat(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "file:///tmp/data/")
-                .parameters())
+            QueryGenerator.generateOverlapQuery("realmId", -123, "file:///tmp/data/").parameters())
         .contains("//", "///")
         .doesNotContain("/");
   }
@@ -437,11 +432,11 @@ public class QueryGeneratorTest {
     // an ESCAPE clause) so they match literally rather than as wildcards; the exact-match prefix
     // terms use "=" and must keep the raw characters.
     assertTrue(
-        QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/a_b/c%d/")
+        QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/a_b/c%d/")
             .sql()
             .contains("location_without_scheme LIKE ? ESCAPE '\\'"));
     Assertions.assertThat(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/a_b/c%d/")
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/a_b/c%d/")
                 .parameters())
         .endsWith("//bucket/a\\_b/c\\%d/%")
         .contains("//bucket/a_b", "//bucket/a_b/c%d");
@@ -453,8 +448,7 @@ public class QueryGeneratorTest {
     // escaped
     // so a descendant whose path contains a backslash is still matched rather than silently missed.
     Assertions.assertThat(
-            QueryGenerator.generateOverlapQuery("realmId", 2, -123, "s3://bucket/a\\b/")
-                .parameters())
+            QueryGenerator.generateOverlapQuery("realmId", -123, "s3://bucket/a\\b/").parameters())
         .endsWith("//bucket/a\\\\b/%");
   }
 
@@ -466,7 +460,7 @@ public class QueryGeneratorTest {
     params.put("parent_id", 2L);
     String sql =
         QueryGenerator.generateExistsQuery(
-                ModelEntity.getAllColumnNames(2), ModelEntity.TABLE_NAME, params)
+                ModelEntity.getAllColumnNames(), ModelEntity.TABLE_NAME, params)
             .sql();
     assertTrue(sql.startsWith("SELECT 1 "), sql);
     assertTrue(sql.endsWith("LIMIT 1"), sql);
@@ -482,7 +476,7 @@ public class QueryGeneratorTest {
         IllegalArgumentException.class,
         () ->
             QueryGenerator.generateExistsQuery(
-                ModelEntity.getAllColumnNames(2),
+                ModelEntity.getAllColumnNames(),
                 ModelEntity.TABLE_NAME,
                 Map.of("not_a_column", 1)));
   }
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/SchemaVersions.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/SchemaVersions.java
deleted file mode 100644
index ddebc385e6..0000000000
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/SchemaVersions.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.polaris.persistence.relational.jdbc;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.stream.Stream;
-
-/** Discovers JDBC schema versions available on the test classpath for a {@link DatabaseType}. */
-final class SchemaVersions {
-
-  private SchemaVersions() {}
-
-  /**
-   * Returns sorted schema versions for which {@code <database>/schema-vN.sql} exists on the
-   * classpath.
-   *
-   * <p>Every version from the type's first schema version through {@link
-   * DatabaseType#getLatestSchemaVersion()} must be present. H2 {@code schema-v0.sql} lives in test
-   * resources to cover legacy bootstrap behavior; production schema files live in main resources.
-   */
-  static SortedSet<Integer> discover(DatabaseType databaseType) {
-    ClassLoader classLoader = SchemaVersions.class.getClassLoader();
-    int firstVersion = firstSchemaVersion(databaseType);
-    int latestVersion = databaseType.getLatestSchemaVersion();
-    SortedSet<Integer> versions = new TreeSet<>();
-    List<Integer> missingVersions = new ArrayList<>();
-    for (int version = firstVersion; version <= latestVersion; version++) {
-      String resource = String.format("%s/schema-v%d.sql", databaseType.getDisplayName(), version);
-      if (classLoader.getResource(resource) == null) {
-        missingVersions.add(version);
-      } else {
-        versions.add(version);
-      }
-    }
-    if (!missingVersions.isEmpty()) {
-      throw new IllegalStateException(
-          String.format(
-              "Missing %s schema resource(s) %s for version(s) %s (expected versions %d-%d)",
-              databaseType,
-              missingVersions.stream()
-                  .map(
-                      version ->
-                          String.format(
-                              "%s/schema-v%d.sql", databaseType.getDisplayName(), version))
-                  .toList(),
-              missingVersions,
-              firstVersion,
-              latestVersion));
-    }
-    return versions;
-  }
-
-  static Stream<Integer> discoverAsStream(DatabaseType databaseType) {
-    return discover(databaseType).stream();
-  }
-
-  private static int firstSchemaVersion(DatabaseType databaseType) {
-    return switch (databaseType) {
-      case H2 -> 0;
-      case POSTGRES, COCKROACHDB -> 1;
-    };
-  }
-}
diff --git a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEventTest.java b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEventTest.java
index dd4a70a13e..8c9682f891 100644
--- a/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEventTest.java
+++ b/persistence/relational-jdbc/src/test/java/org/apache/polaris/persistence/relational/jdbc/models/ModelEventTest.java
@@ -55,7 +55,6 @@ public class ModelEventTest {
   private static final String TEST_RESOURCE_IDENTIFIER = "test-table";
   private static final String EMPTY_JSON = "{}";
   private static final String TEST_JSON = "{\"key\":\"value\"}";
-  private static final int LATEST_SCHEMA_VERSION = DatabaseType.H2.getLatestSchemaVersion();
 
   @Test
   public void testFromResultSet() throws SQLException {
@@ -124,7 +123,7 @@ public class ModelEventTest {
     polarisEvent.setAdditionalProperties(TEST_JSON);
 
     // Act
-    ModelEvent modelEvent = ModelEvent.fromEvent(polarisEvent, LATEST_SCHEMA_VERSION);
+    ModelEvent modelEvent = ModelEvent.fromEvent(polarisEvent);
     Map<String, Object> resultMap = modelEvent.toMap(DatabaseType.H2);
     EventEntity result = ModelEvent.toEvent(modelEvent);
 
@@ -137,27 +136,6 @@ public class ModelEventTest {
     assertEquals(TEST_JSON, result.getAdditionalProperties());
   }
 
-  @Test
-  public void testFromEventStoresLegacySentinelForNullCatalogIdOnPreV5Schema() {
-    // Arrange
-    EventEntity polarisEvent =
-        new EventEntity(
-            null,
-            TEST_EVENT_ID,
-            TEST_REQUEST_ID,
-            TEST_EVENT_TYPE,
-            TEST_TIMESTAMP_MS,
-            TEST_USER,
-            TEST_RESOURCE_TYPE,
-            TEST_RESOURCE_IDENTIFIER);
-
-    // Act
-    ModelEvent modelEvent = ModelEvent.fromEvent(polarisEvent, 4);
-
-    // Assert
-    assertEquals(ModelEvent.LEGACY_REALM_SCOPED_CATALOG_ID, modelEvent.getCatalogId());
-  }
-
   @Test
   public void testToMapWithH2DatabaseType() {
     // Arrange
@@ -227,7 +205,7 @@ public class ModelEventTest {
   @Test
   public void testFromEventWithNullInput() {
     // Act
-    ModelEvent result = ModelEvent.fromEvent(null, LATEST_SCHEMA_VERSION);
+    ModelEvent result = ModelEvent.fromEvent(null);
 
     // Assert
     assertNull(result);
@@ -249,7 +227,7 @@ public class ModelEventTest {
     polarisEvent.setAdditionalProperties(TEST_JSON);
 
     // Act
-    ModelEvent result = ModelEvent.fromEvent(polarisEvent, LATEST_SCHEMA_VERSION);
+    ModelEvent result = ModelEvent.fromEvent(polarisEvent);
 
     // Assert
     assertEquals(TEST_CATALOG_ID, result.getCatalogId());
diff --git a/persistence/relational-jdbc/src/test/resources/h2/schema-v0.sql b/persistence/relational-jdbc/src/test/resources/h2/schema-v0.sql
deleted file mode 100644
index 0fc24f365c..0000000000
--- a/persistence/relational-jdbc/src/test/resources/h2/schema-v0.sql
+++ /dev/null
@@ -1,109 +0,0 @@
---
--- Licensed to the Apache Software Foundation (ASF) under one
--- or more contributor license agreements.  See the NOTICE file--
---  distributed with this work for additional information
--- regarding copyright ownership.  The ASF licenses this file
--- to you under the Apache License, Version 2.0 (the
--- "License"). You may not use this file except in compliance
--- with the License.  You may obtain a copy of the License at
---
---  http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing,
--- software distributed under the License is distributed on an
--- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--- KIND, either express or implied.  See the License for the
--- specific language governing permissions and limitations
--- under the License.
---
-
-
--- TO SIMULATE the schema in Polaris 1.0.x, which doesn't have the version table, Polaris interpret its schema version as 0, even the schema file named "schema-v1.sql".
-CREATE SCHEMA IF NOT EXISTS POLARIS_SCHEMA;
-SET SCHEMA POLARIS_SCHEMA;
-
-CREATE TABLE IF NOT EXISTS entities (
-   realm_id TEXT NOT NULL,
-   catalog_id BIGINT NOT NULL,
-   id BIGINT NOT NULL,
-   parent_id BIGINT NOT NULL,
-   name TEXT NOT NULL,
-   entity_version INT NOT NULL,
-   type_code INT NOT NULL,
-   sub_type_code INT NOT NULL,
-   create_timestamp BIGINT NOT NULL,
-   drop_timestamp BIGINT NOT NULL,
-   purge_timestamp BIGINT NOT NULL,
-   to_purge_timestamp BIGINT NOT NULL,
-   last_update_timestamp BIGINT NOT NULL,
-   properties TEXT NOT NULL DEFAULT '{}',
-   internal_properties TEXT NOT NULL DEFAULT '{}',
-   grant_records_version INT NOT NULL,
-   PRIMARY KEY (realm_id, id),
-CONSTRAINT constraint_name UNIQUE (realm_id, catalog_id, parent_id, type_code, name)
-);
-
--- TODO: create indexes based on all query pattern.
-CREATE INDEX IF NOT EXISTS idx_entities ON entities (realm_id, catalog_id, id);
-
-COMMENT ON TABLE entities IS 'all the entities';
-
-COMMENT ON COLUMN entities.catalog_id IS 'catalog id';
-COMMENT ON COLUMN entities.id IS 'entity id';
-COMMENT ON COLUMN entities.parent_id IS 'entity id of parent';
-COMMENT ON COLUMN entities.name IS 'entity name';
-COMMENT ON COLUMN entities.entity_version IS 'version of the entity';
-COMMENT ON COLUMN entities.type_code IS 'type code';
-COMMENT ON COLUMN entities.sub_type_code IS 'sub type of entity';
-COMMENT ON COLUMN entities.create_timestamp IS 'creation time of entity';
-COMMENT ON COLUMN entities.drop_timestamp IS 'time of drop of entity';
-COMMENT ON COLUMN entities.purge_timestamp IS 'time to start purging entity';
-COMMENT ON COLUMN entities.last_update_timestamp IS 'last time the entity is touched';
-COMMENT ON COLUMN entities.properties IS 'entities properties json';
-COMMENT ON COLUMN entities.internal_properties IS 'entities internal properties json';
-COMMENT ON COLUMN entities.grant_records_version IS 'the version of grant records change on the entity';
-
-DROP TABLE IF EXISTS grant_records;
-CREATE TABLE IF NOT EXISTS grant_records (
-    realm_id TEXT NOT NULL,
-    securable_catalog_id BIGINT NOT NULL,
-    securable_id BIGINT NOT NULL,
-    grantee_catalog_id BIGINT NOT NULL,
-    grantee_id BIGINT NOT NULL,
-    privilege_code INTEGER,
-    PRIMARY KEY (realm_id, securable_catalog_id, securable_id, grantee_catalog_id, grantee_id, privilege_code)
-);
-
-COMMENT ON TABLE grant_records IS 'grant records for entities';
-COMMENT ON COLUMN grant_records.securable_catalog_id IS 'catalog id of the securable';
-COMMENT ON COLUMN grant_records.securable_id IS 'entity id of the securable';
-COMMENT ON COLUMN grant_records.grantee_catalog_id IS 'catalog id of the grantee';
-COMMENT ON COLUMN grant_records.grantee_id IS 'id of the grantee';
-COMMENT ON COLUMN grant_records.privilege_code IS 'privilege code';
-
-DROP TABLE IF EXISTS principal_authentication_data;
-CREATE TABLE IF NOT EXISTS principal_authentication_data (
-    realm_id TEXT NOT NULL,
-    principal_id BIGINT NOT NULL,
-    principal_client_id VARCHAR(255) NOT NULL,
-    main_secret_hash VARCHAR(255) NOT NULL,
-    secondary_secret_hash VARCHAR(255) NOT NULL,
-    secret_salt VARCHAR(255) NOT NULL,
-    PRIMARY KEY (realm_id, principal_client_id)
-);
-
-COMMENT ON TABLE principal_authentication_data IS 'authentication data for client';
-
-DROP TABLE IF EXISTS policy_mapping_record;
-CREATE TABLE IF NOT EXISTS policy_mapping_record (
-    realm_id TEXT NOT NULL,
-    target_catalog_id BIGINT NOT NULL,
-    target_id BIGINT NOT NULL,
-    policy_type_code INTEGER NOT NULL,
-    policy_catalog_id BIGINT NOT NULL,
-    policy_id BIGINT NOT NULL,
-    parameters TEXT NOT NULL DEFAULT '{}',
-    PRIMARY KEY (realm_id, target_catalog_id, target_id, policy_type_code, policy_catalog_id, policy_id)
-);
-
-CREATE INDEX IF NOT EXISTS idx_policy_mapping_record ON policy_mapping_record (realm_id, policy_type_code, policy_catalog_id, policy_id, target_catalog_id, target_id);
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/config/BehaviorChangeConfiguration.java b/polaris-core/src/main/java/org/apache/polaris/core/config/BehaviorChangeConfiguration.java
index a4171236f1..9acbc8c8cf 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/config/BehaviorChangeConfiguration.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/config/BehaviorChangeConfiguration.java
@@ -95,14 +95,4 @@ public class BehaviorChangeConfiguration<T> extends PolarisConfiguration<T> {
                   + " credential vending.")
           .defaultValue(false)
           .buildBehaviorChangeConfiguration();
-
-  public static final BehaviorChangeConfiguration<Boolean> SCHEMA_VERSION_FALL_BACK_ON_DNE =
-      PolarisConfiguration.<Boolean>builder()
-          .key("SCHEMA_VERSION_FALL_BACK_ON_DNE")
-          .description(
-              "If set to true, exceptions encountered while loading the VERSION table which appear to be"
-                  + " caused by the VERSION table not existing will be interpreted as meaning that the"
-                  + " schema version is currently 0.")
-          .defaultValue(true)
-          .buildBehaviorChangeConfiguration();
 }
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/BootstrapOptions.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/BootstrapOptions.java
index a9bd907788..f4970da25c 100644
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/BootstrapOptions.java
+++ b/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/BootstrapOptions.java
@@ -26,6 +26,4 @@ public interface BootstrapOptions {
   Iterable<String> realms();
 
   RootCredentialsSet rootCredentialsSet();
-
-  SchemaOptions schemaOptions();
 }
diff --git a/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/SchemaOptions.java b/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/SchemaOptions.java
deleted file mode 100644
index 5cfc20a889..0000000000
--- a/polaris-core/src/main/java/org/apache/polaris/core/persistence/bootstrap/SchemaOptions.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.polaris.core.persistence.bootstrap;
-
-import java.util.Optional;
-import org.apache.polaris.immutables.PolarisImmutable;
-
-@PolarisImmutable
-public interface SchemaOptions {
-  Optional<Integer> schemaVersion();
-}
diff --git a/runtime/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java b/runtime/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java
index 4fbb8e133d..d00b30b028 100644
--- a/runtime/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java
+++ b/runtime/admin/src/main/java/org/apache/polaris/admintool/BootstrapCommand.java
@@ -23,7 +23,6 @@ import java.util.List;
 import java.util.Map;
 import org.apache.polaris.core.persistence.bootstrap.BootstrapOptions;
 import org.apache.polaris.core.persistence.bootstrap.ImmutableBootstrapOptions;
-import org.apache.polaris.core.persistence.bootstrap.ImmutableSchemaOptions;
 import org.apache.polaris.core.persistence.bootstrap.RootCredentialsSet;
 import org.apache.polaris.core.persistence.dao.entity.PrincipalSecretsResult;
 import picocli.CommandLine;
@@ -125,7 +124,6 @@ public class BootstrapCommand extends BaseMetaStoreCommand {
           ImmutableBootstrapOptions.builder()
               .realms(realms)
               .rootCredentialsSet(rootCredentialsSet)
-              .schemaOptions(ImmutableSchemaOptions.builder().build())
               .build();
 
       // Execute the bootstrap
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerIntegrationTest.java b/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerIntegrationTest.java
index 16d8842d02..fde1a2c0b5 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerIntegrationTest.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerIntegrationTest.java
@@ -157,10 +157,7 @@ class InMemoryBufferEventListenerIntegrationTest {
       assertThat(response).returns(Response.Status.OK.getStatusCode(), Response::getStatus);
     }
 
-    String query =
-        "SELECT * FROM polaris_schema.events WHERE realm_id = '"
-            + realm
-            + "' ORDER BY timestamp_ms";
+    String query = "SELECT * FROM events WHERE realm_id = '" + realm + "' ORDER BY timestamp_ms";
 
     List<EventEntity> events =
         await()
diff --git a/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerTestBase.java b/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerTestBase.java
index ba9e062659..2583156998 100644
--- a/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerTestBase.java
+++ b/runtime/service/src/test/java/org/apache/polaris/service/events/listeners/inmemory/InMemoryBufferEventListenerTestBase.java
@@ -72,7 +72,7 @@ abstract class InMemoryBufferEventListenerTestBase {
     producerInstance.destroy(producer);
     try (Connection connection = dataSource.get().getConnection();
         Statement statement = connection.createStatement()) {
-      statement.execute("DELETE FROM polaris_schema.events");
+      statement.execute("DELETE FROM events");
     }
   }
 
@@ -84,7 +84,7 @@ abstract class InMemoryBufferEventListenerTestBase {
 
   @SuppressWarnings("SqlSourceToSinkFlow")
   void assertRows(String realmId, int expected) {
-    String query = "SELECT COUNT(*) FROM polaris_schema.events WHERE realm_id = '" + realmId + "'";
+    String query = "SELECT COUNT(*) FROM events WHERE realm_id = '" + realmId + "'";
     await()
         .atMost(Duration.ofSeconds(10))
         .untilAsserted(
diff --git a/site/content/in-dev/unreleased/configuration/config-sections/flags-polaris_behavior_changes.md b/site/content/in-dev/unreleased/configuration/config-sections/flags-polaris_behavior_changes.md
index 68c1b177d9..a351f4d8db 100644
--- a/site/content/in-dev/unreleased/configuration/config-sections/flags-polaris_behavior_changes.md
+++ b/site/content/in-dev/unreleased/configuration/config-sections/flags-polaris_behavior_changes.md
@@ -44,15 +44,6 @@ Whether or not to use soft values in the entity cache
 
 ---
 
-##### `polaris.behavior-changes."SCHEMA_VERSION_FALL_BACK_ON_DNE"`
-
-If set to true, exceptions encountered while loading the VERSION table which appear to be caused by the VERSION table not existing will be interpreted as meaning that the schema version is currently 0.
-
-- **Type:** `Boolean`
-- **Default:** `true`
-
----
-
 ##### `polaris.behavior-changes."STORAGE_CONFIGURATION_MAX_LOCATIONS"`
 
 How many locations can be associated with a storage configuration, or -1 for unlimited locations
diff --git a/site/content/in-dev/unreleased/metastores/relational-jdbc.md b/site/content/in-dev/unreleased/metastores/relational-jdbc.md
index 2edefa0e48..ad03ebe1e2 100644
--- a/site/content/in-dev/unreleased/metastores/relational-jdbc.md
+++ b/site/content/in-dev/unreleased/metastores/relational-jdbc.md
@@ -22,12 +22,24 @@ type: docs
 weight: 100
 ---
 
-This implementation leverages Quarkus for datasource management and supports configuration through
-environment variables or JVM -D flags at startup. For more information, refer to the [Quarkus configuration reference](https://quarkus.io/guides/config-reference#env-file).
+The Relational JDBC metastore relies on a Quarkus-managed datasource. For more information, refer to
+the [Quarkus datasource documentation] and [Quarkus configuration reference].
 
-We have 2 options for configuring the persistence backend:
+{{< alert important >}}
+The JDBC metastore currently supports only PostgreSQL and CockroachDB databases.
+{{< /alert >}}
+
+## Configuration
+
+Check below two configuration examples:
 
-## 1. Relational JDBC metastore with username and password
+1. Regular JDBC connection with username and password.
+2. AWS Aurora PostgreSQL metastore using IAM AWS authentication.
+
+The examples show the basic configuration, but many other options are available. For more details, 
+please refer to the [Quarkus configuration reference].
+
+### 1. Relational JDBC metastore with username and password
 
 Using environment variables:
 
@@ -48,7 +60,7 @@ quarkus.datasource.jdbc.password=<your-password>
 quarkus.datasource.jdbc.jdbc-url=<jdbc-url-of-postgres>
 ```
 
-## 2. AWS Aurora PostgreSQL metastore using IAM AWS authentication
+### 2. AWS Aurora PostgreSQL metastore using IAM AWS authentication
 
 ```properties
 polaris.persistence.type=relational-jdbc
@@ -66,31 +78,105 @@ quarkus.rds.credentials-provider.aws.hostname=polaris-cluster.cluster-xyz.us-eas
 quarkus.rds.credentials-provider.aws.port=6160
 ```
 
-This is the basic configuration. For more details, please refer to the [Quarkus plugin documentation](https://docs.quarkiverse.io/quarkus-amazon-services/dev/amazon-rds.html#_configuration_reference).
+For more details about how to configure the AWS Aurora PostgreSQL metastore using IAM AWS
+authentication, please refer to the [Quarkus Amazon RDS Client docs].
+
+[Quarkus Amazon RDS Client docs]: https://docs.quarkiverse.io/quarkus-amazon-services/dev/amazon-rds.html#_configuration_reference
 
-The Relational JDBC metastore currently relies on a Quarkus-managed datasource and supports only PostgreSQL and H2 databases. At this time, official documentation is provided exclusively for usage with PostgreSQL.
-Please refer to the documentation here:
-[Configure data sources in Quarkus](https://quarkus.io/guides/datasource).
+### Additional configuration
 
-Additionally, the retries can be configured via `polaris.persistence.relational.jdbc.*` properties; please refer to the [Configuring Polaris]({{% ref "../configuration" %}}) section.
+The following `polaris.persistence.relational.jdbc.*` properties tune retry behavior and database
+type detection:
+
+```properties
+# Maximum number of attempts for retryable operations (default: 1, i.e. no retries)
+polaris.persistence.relational.jdbc.max-retries=3
+
+# Maximum total time to spend on retries in milliseconds (default: 5000)
+polaris.persistence.relational.jdbc.max-duration-in-ms=10000
+
+# Initial delay between retries in milliseconds, doubled on each attempt (default: 100)
+polaris.persistence.relational.jdbc.initial-delay-in-ms=200
+
+# Explicitly set the database type instead of inferring it from JDBC metadata.
+# Supported values: postgresql, cockroachdb, h2
+polaris.persistence.relational.jdbc.database-type=postgresql
+```
 
-By default, Polaris stores its tables in a schema named `POLARIS_SCHEMA`. The schema is selected entirely through the datasource configuration — Polaris ships the default as the JDBC driver's `currentSchema` connection property (`quarkus.datasource.jdbc.additional-jdbc-properties.currentSchema=POLARIS_SCHEMA`), and the persistence code itself is agnostic of the schema name. To use a different schema (for example, to run multiple Polaris deployments in the same database or to comply with  [...]
+For the full list of available properties with their types and defaults, please refer to the
+[Configuring Polaris]({{% ref "../configuration" %}}) section.
 
-The schema must exist before Polaris connects: Polaris does not issue `CREATE SCHEMA`, since that is a privileged operation best performed by a database administrator. Setting up a fresh deployment is therefore a two-step procedure: a DBA first creates the schema (for example `CREATE SCHEMA polaris_schema;`), then the [Admin Tool]({{% ref "../admin-tool" %}}) bootstraps the realm using a datasource configured with the same schema. The database user Polaris runs with needs `USAGE` (and, f [...]
+## SQL Schema
+
+### Schema Name
+
+By default, Polaris stores its tables in a schema named `POLARIS_SCHEMA`. The schema is selected
+entirely through the datasource configuration — the persistence code itself is agnostic of the
+schema name. Polaris ships the following default in `application.properties`:
+
+```properties
+quarkus.datasource.jdbc.additional-jdbc-properties.currentSchema=POLARIS_SCHEMA
+```
+
+This sets the PostgreSQL (and CockroachDB) driver's `currentSchema` connection property on every
+connection. To use a different schema — for example, to run multiple Polaris deployments in the
+same database or to comply with a schema-naming policy — override this property:
+
+```properties
+quarkus.datasource.jdbc.additional-jdbc-properties.currentSchema=<your-schema-name>
+```
+
+Alternatively, set `currentSchema` directly in the JDBC URL; the URL takes precedence over the
+property. The name is passed to the driver unquoted, so the database applies its usual identifier
+case folding (for example, PostgreSQL folds it to lowercase).
 
 {{< alert important >}}
-**Upgrading an existing deployment:** if your JDBC URL already sets `currentSchema`, check it
-before upgrading. Earlier versions qualified every query with `POLARIS_SCHEMA`, so the setting had
-no effect on where Polaris read and wrote. It is now what selects the schema, and a value in the
-URL takes precedence over the shipped default — so an upgrade can point Polaris away from its
-existing tables, and a subsequent bootstrap would create a second, empty set of tables in the other
-schema. Either remove the setting from the URL, or point it at the schema that already holds your
-Polaris tables. Deployments that never set `currentSchema` are unaffected.
+**Upgrading an existing, pre-1.8.0 deployment to Polaris 1.8.0 or higher:** if your JDBC URL already
+sets `currentSchema`, check it before upgrading. Earlier versions qualified every query with
+`POLARIS_SCHEMA`, so the setting had no effect on where Polaris read and wrote. It is now what
+selects the schema, and a value in the URL takes precedence over the shipped default — so an upgrade
+can point Polaris away from its existing tables, and a subsequent bootstrap would create a second,
+empty set of tables in the other schema. Either remove the setting from the URL, or point it at the
+schema that already holds your Polaris tables. Deployments that never set `currentSchema` are
+unaffected.
+{{< /alert >}}
+
+### Schema Structure
+
+Starting with Polaris 1.8.0, each Polaris binary ships a single `schema.sql` script for each
+supported database type.
+
+For this release ({{< releaseVersion >}}), the corresponding SQL files are:
+
+* PostgreSQL: [schema.sql]({{< github-polaris "persistence/relational-jdbc/src/main/resources/postgres/schema.sql" >}})
+* CockroachDB: [schema.sql]({{< github-polaris "persistence/relational-jdbc/src/main/resources/cockroachdb/schema.sql" >}})
+
+The `schema.sql` file is versioned, and contains the SQL statements to create the Polaris schema and
+tables, as well as the initial data for the `version` table that tracks the schema version.
+
+{{< alert note >}}
+Prior to Polaris 1.8.0, each schema version used to have its own SQL file, e.g. `schema-v1.sql`,
+`schema-v2.sql`, etc.
 {{< /alert >}}
 
-## Bootstrapping Polaris
+Polaris checks the `version` table on the first request to each realm, and fails fast with an
+actionable error message if the recorded version does not match what the binary expects.
+
+## Setting Up a Fresh Deployment
+
+Setting up a fresh deployment is a two-step procedure:
 
-Before using Polaris with the Relational JDBC backend, you must bootstrap the metastore to create the necessary schema and initial realm. This is done using the [Admin Tool]({{% ref "../admin-tool" %}}).
+1. **A database administrator creates the schema.** Polaris does not issue `CREATE SCHEMA`, since
+   that is a privileged operation best performed by a DBA. For example:
+   ```sql
+   CREATE SCHEMA polaris_schema;
+   ```
+   The database user that Polaris runs with needs `USAGE` (and, for bootstrap, `CREATE`) privileges
+   on that schema only.
+
+2. **The [Admin Tool]({{% ref "../admin-tool" %}}) bootstraps the realm.** The bootstrap command
+   creates the necessary SQL tables (using the `schema.sql` shipped with the binary) and the initial
+   realm. The datasource must be configured with the same schema as the one created in step 1.
 
 Using Docker:
 
@@ -100,6 +186,7 @@ docker run --rm -it \
   --env="quarkus.datasource.username=<your-username>" \
   --env="quarkus.datasource.password=<your-password>" \
   --env="quarkus.datasource.jdbc.url=<jdbc-url-of-postgres>" \
+  --env="quarkus.datasource.jdbc.additional-jdbc-properties.currentSchema=POLARIS_SCHEMA" \
   apache/polaris-admin-tool:latest bootstrap -r <realm-name> -c <realm-name>,<client-id>,<client-secret>
 ```
 
@@ -111,32 +198,79 @@ java \
   -Dquarkus.datasource.username=<your-username> \
   -Dquarkus.datasource.password=<your-password> \
   -Dquarkus.datasource.jdbc.url=<jdbc-url-of-postgres> \
+  "-Dquarkus.datasource.jdbc.additional-jdbc-properties.currentSchema=POLARIS_SCHEMA" \
   -jar polaris-admin-tool.jar bootstrap -r <realm-name> -c <realm-name>,<client-id>,<client-secret>
 ```
 
-For more details on the bootstrap command and other administrative operations, see the [Admin Tool]({{% ref "../admin-tool" %}}) documentation.
+Replace `POLARIS_SCHEMA` with the schema name created in step 1 if you chose a different name. See
+the [Schema name](#schema-name) section for details. Alternatively, set `currentSchema` directly in
+the JDBC URL; the URL takes precedence over the property.
+
+For more details on the bootstrap command and other administrative operations, see the
+[Admin Tool]({{% ref "../admin-tool" %}}) documentation.
+
+## Upgrading Polaris
 
-## Schema upgrades
+Upgrading Polaris on an existing installation requires two steps, in this order:
 
-Polaris does not run automated schema migrations. Bootstrapping applies a full `schema-vN.sql`
-script and records the schema version in the `polaris_schema.version` table; upgrading an existing
-database to a newer schema version is a manual, operator-driven step.
+1. **Apply schema migrations** for each schema version between your current version and the target
+   version (see below). Schema migrations must be applied **before** starting the new Polaris 
+   binary. The first request to any realm whose recorded schema version does not match what the 
+   binary expects will fail fast with an actionable error message.
 
-### Upgrading to schema v5
+2. **Bootstrap new realms** if needed. Re-bootstrapping an existing installation is not required
+   unless you want to add new realms. The bootstrap command is idempotent — already-bootstrapped
+   realms are simply ignored — so it can be safely run again if needed.
+
+{{< alert important >}}
+**Re-bootstrapping is not sufficient to upgrade the SQL schema.** Always apply schema migrations
+first.
+{{< /alert >}}
 
-Schema v5 makes the `events.catalog_id` column nullable: events that are not scoped to a catalog
-(principal, policy, rate-limiting, etc.) store `NULL` instead of the legacy placeholder string
-`__realm__` that pre-v5 schemas required (the placeholder only ever existed in 1.6.0 release
-candidates).
+## Schema Upgrades
 
-Until you upgrade, the server keeps working: it detects a schema version below 5 from the
-`polaris_schema.version` table at startup and continues writing the legacy placeholder for events
-that are not catalog-scoped. To upgrade an existing v3/v4 database, run the following one-time SQL
-(adjust the `ALTER` syntax to your database if needed — the statements below work on PostgreSQL,
-CockroachDB, and H2), then restart Polaris:
+Starting with schema version v6 (Polaris 1.9.0), schema changes are versioned in git, and you can
+use regular diff tools to compare the two files and see the differences between two release tags.
+Polaris release git tags are of the form: `apache-polaris-<version>`, e.g. `apache-polaris-1.9.0`.
 
-```sql
-ALTER TABLE polaris_schema.events ALTER COLUMN catalog_id DROP NOT NULL;
-UPDATE polaris_schema.events SET catalog_id = NULL WHERE catalog_id = '__realm__';
-UPDATE polaris_schema.version SET version_value = 5 WHERE version_key = 'version';
+For example, to get the diff between the PostgreSQL schema SQL file between Polaris 1.9.0 and
+1.10.0, you can run the following command:
+
+```bash
+git diff apache-polaris-1.9.0 apache-polaris-1.10.0 -- persistence/relational-jdbc/src/main/resources/postgres/schema.sql
 ```
+
+Refer to the [Schema Version Reference](#schema-version-reference) table for links to the full
+schema SQL file for each database type.
+
+{{< alert important >}}
+Git diffs of `schema.sql` are only possible starting from schema v6 (Polaris 1.9.0).
+{{< /alert >}}
+
+Older schema versions had each their own versioned schema file. Refer to the [Schema Version
+Reference](#schema-version-reference) table for links to the specific SQL file for each database
+type at the desired version.
+
+## Schema Version Reference
+
+The table below maps each released Polaris version to the JDBC schema version it ships with:
+
+| Schema version | Polaris version                                 | Notable schema changes                                                                                                                             | Full schema SQL             |
+|----------------|-------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------|
+| v1             | 1.0.0&#8209;incubating                          | Initial schema                                                                                                                                     | [PG][v1-pg]                 |
+| v2             | 1.1.0&#8209;incubating                          | Added `entities.location_without_scheme` column and `idx_locations` index                                                                          | [PG][v2-pg]                 |
+| v3             | 1.2.0&#8209;incubating – 1.3.0&#8209;incubating | Added `events` table                                                                                                                               | [PG][v3-pg]                 |
+| v4             | 1.4.0 – 1.6.0                                   | Added `scan_metrics_report` and `commit_metrics_report` tables; added `idempotency_records` table; added indexes on `entities` and `grant_records` | [PG][v4-pg] · [CRD][v4-crd] |
+| v5             | 1.7.0                                           | `events.catalog_id` made nullable; `idempotency_records` removed                                                                                   | [PG][v5-pg] · [CRD][v5-crd] |
+| v6             | In Development                                  | Switched to single `schema.sql` script; changed `idx_locations` index definition                                                                   |                             |
+
+[Quarkus configuration reference]: https://quarkus.io/guides/config-reference
+[Quarkus datasource documentation]: https://quarkus.io/guides/datasource
+
+[v1-pg]: https://github.com/apache/polaris/blob/apache-polaris-1.0.0-incubating/persistence/relational-jdbc/src/main/resources/postgres/schema-v1.sql
+[v2-pg]: https://github.com/apache/polaris/blob/apache-polaris-1.1.0-incubating/persistence/relational-jdbc/src/main/resources/postgres/schema-v2.sql
+[v3-pg]: https://github.com/apache/polaris/blob/apache-polaris-1.2.0-incubating/persistence/relational-jdbc/src/main/resources/postgres/schema-v3.sql
+[v4-pg]: https://github.com/apache/polaris/blob/apache-polaris-1.4.0/persistence/relational-jdbc/src/main/resources/postgres/schema-v4.sql
+[v4-crd]: https://github.com/apache/polaris/blob/apache-polaris-1.4.0/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v4.sql
+[v5-pg]: https://github.com/apache/polaris/blob/apache-polaris-1.7.0/persistence/relational-jdbc/src/main/resources/postgres/schema-v5.sql
+[v5-crd]: https://github.com/apache/polaris/blob/apache-polaris-1.7.0/persistence/relational-jdbc/src/main/resources/cockroachdb/schema-v5.sql