diff --git a/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp b/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp
index e2e35372a3759e..224aa3881be832 100644
--- a/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp
+++ b/crates/sui-graphql-e2e-tests/tests/epoch/chain_identifier.exp
@@ -3,10 +3,10 @@ processed 3 tasks
 init:
 C: object(0,0)
 
-task 1 'create-checkpoint'. lines 8-8:
+task 1 'create-checkpoint'. lines 7-7:
 Checkpoint created: 1
 
-task 2 'run-graphql'. lines 10-13:
+task 2 'run-graphql'. lines 9-12:
 Response: {
   "data": {
     "chainIdentifier": "8f58ad28"
diff --git a/crates/sui-indexer/src/schema/mod.rs b/crates/sui-indexer/src/schema/mod.rs
index 46d7f44c69813c..d2be9dd0ebcec8 100644
--- a/crates/sui-indexer/src/schema/mod.rs
+++ b/crates/sui-indexer/src/schema/mod.rs
@@ -54,7 +54,6 @@ mod inner {
     pub use crate::schema::mysql::objects_version;
     pub use crate::schema::mysql::packages;
     pub use crate::schema::mysql::transactions;
-    pub use crate::schema::mysql::tx_calls;
     pub use crate::schema::mysql::tx_changed_objects;
     pub use crate::schema::mysql::tx_digests;
     pub use crate::schema::mysql::tx_input_objects;
diff --git a/crates/sui-indexer/src/schema/pg.rs b/crates/sui-indexer/src/schema/pg.rs
index 0f8cabdedf1368..1d5843195a8706 100644
--- a/crates/sui-indexer/src/schema/pg.rs
+++ b/crates/sui-indexer/src/schema/pg.rs
@@ -1,11 +1,15 @@
+// Copyright (c) Mysten Labs, Inc.
+// SPDX-License-Identifier: Apache-2.0
 // @generated automatically by Diesel CLI.
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     chain_identifier (checkpoint_digest) {
         checkpoint_digest -> Bytea,
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     checkpoints (sequence_number) {
         sequence_number -> Int8,
@@ -29,6 +33,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     display (object_type) {
         object_type -> Text,
@@ -38,6 +43,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     epochs (epoch) {
         epoch -> Int8,
@@ -62,6 +68,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_emit_module (package, module, tx_sequence_number, event_sequence_number) {
         package -> Bytea,
@@ -72,6 +79,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_emit_package (package, tx_sequence_number, event_sequence_number) {
         package -> Bytea,
@@ -81,6 +89,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_senders (sender, tx_sequence_number, event_sequence_number) {
         sender -> Bytea,
@@ -89,6 +98,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_struct_instantiation (package, module, type_instantiation, tx_sequence_number, event_sequence_number) {
         package -> Bytea,
@@ -100,6 +110,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_struct_module (package, module, tx_sequence_number, event_sequence_number) {
         package -> Bytea,
@@ -110,6 +121,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_struct_name (package, module, type_name, tx_sequence_number, event_sequence_number) {
         package -> Bytea,
@@ -121,6 +133,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     event_struct_package (package, tx_sequence_number, event_sequence_number) {
         package -> Bytea,
@@ -130,6 +143,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     events (tx_sequence_number, event_sequence_number) {
         tx_sequence_number -> Int8,
@@ -148,6 +162,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     events_partition_0 (tx_sequence_number, event_sequence_number) {
         tx_sequence_number -> Int8,
@@ -166,6 +181,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     objects (object_id) {
         object_id -> Bytea,
@@ -188,6 +204,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     objects_history (checkpoint_sequence_number, object_id, object_version) {
         object_id -> Bytea,
@@ -211,6 +228,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     objects_history_partition_0 (checkpoint_sequence_number, object_id, object_version) {
         object_id -> Bytea,
@@ -234,6 +252,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     objects_snapshot (object_id) {
         object_id -> Bytea,
@@ -257,6 +276,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     objects_version (object_id, object_version) {
         object_id -> Bytea,
@@ -265,6 +285,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     packages (package_id, original_id, package_version) {
         package_id -> Bytea,
@@ -275,6 +296,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     transactions (tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -291,6 +313,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     transactions_partition_0 (tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -307,6 +330,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_calls_fun (package, module, func, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -317,6 +341,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_calls_mod (package, module, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -326,6 +351,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_calls_pkg (package, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -334,6 +360,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_changed_objects (object_id, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -342,6 +369,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_digests (tx_digest) {
         tx_digest -> Bytea,
@@ -349,6 +377,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_input_objects (object_id, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -357,6 +386,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_kinds (tx_kind, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -364,6 +394,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_recipients (recipient, tx_sequence_number) {
         tx_sequence_number -> Int8,
@@ -372,6 +403,7 @@ diesel::table! {
     }
 }
 
+#[cfg(feature = "postgres-feature")]
 diesel::table! {
     tx_senders (sender, tx_sequence_number) {
         tx_sequence_number -> Int8,