diff --git a/common/dao/src/test/scala/org/apache/texera/dao/UserWarehouseSpec.scala b/common/dao/src/test/scala/org/apache/texera/dao/UserWarehouseSpec.scala
new file mode 100644
index 00000000000..19d8ca78a24
--- /dev/null
+++ b/common/dao/src/test/scala/org/apache/texera/dao/UserWarehouseSpec.scala
@@ -0,0 +1,100 @@
+/*
+ * 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.texera.dao
+
+import org.apache.texera.dao.jooq.generated.Tables.{USER, USER_WAREHOUSE}
+import org.jooq.exception.DataAccessException
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.flatspec.AnyFlatSpec
+import org.scalatest.matchers.should.Matchers
+
+/**
+  * Spec for the `user_warehouse` table (#6931). Schema only — nothing reads or writes the
+  * table in production yet — so this pins the DDL's structural properties (columns, the
+  * per-user name uniqueness, and the ownership cascade) against the generated jOOQ classes.
+  */
+class UserWarehouseSpec extends AnyFlatSpec with Matchers with BeforeAndAfterAll with MockTexeraDB {
+
+  override protected def beforeAll(): Unit = {
+    super.beforeAll()
+    initializeDBAndReplaceDSLContext()
+  }
+
+  override protected def afterAll(): Unit =
+    try closeConnectionPool()
+    finally super.afterAll()
+
+  private def insertUser(name: String): Integer =
+    getDSLContext
+      .insertInto(USER, USER.NAME, USER.PASSWORD)
+      .values(name, "password")
+      .returning(USER.UID)
+      .fetchOne()
+      .getUid
+
+  private def insertWarehouse(uid: Integer, name: String, warehouseName: String): Integer =
+    getDSLContext
+      .insertInto(
+        USER_WAREHOUSE,
+        USER_WAREHOUSE.UID,
+        USER_WAREHOUSE.NAME,
+        USER_WAREHOUSE.WAREHOUSE_NAME,
+        USER_WAREHOUSE.FLAVOR
+      )
+      .values(uid, name, warehouseName, "local")
+      .returning(USER_WAREHOUSE.WHID)
+      .fetchOne()
+      .getWhid
+
+  "user_warehouse" should "store a registered warehouse and return it by owner" in {
+    val uid = insertUser("warehouse-owner")
+    insertWarehouse(uid, "mybucket", s"user-$uid-mybucket")
+
+    val row = getDSLContext
+      .selectFrom(USER_WAREHOUSE)
+      .where(USER_WAREHOUSE.UID.eq(uid))
+      .fetchOne()
+    row.getName shouldBe "mybucket"
+    row.getWarehouseName shouldBe s"user-$uid-mybucket"
+    row.getFlavor shouldBe "local"
+    row.getCreatedAt should not be null
+  }
+
+  it should "enforce one warehouse name per user" in {
+    val uid = insertUser("duplicate-name-owner")
+    insertWarehouse(uid, "dup", s"user-$uid-dup")
+
+    a[DataAccessException] should be thrownBy
+      insertWarehouse(uid, "dup", s"user-$uid-dup-2")
+  }
+
+  it should "cascade-delete a user's warehouses with the user" in {
+    val uid = insertUser("cascade-owner")
+    insertWarehouse(uid, "doomed", s"user-$uid-doomed")
+
+    getDSLContext.deleteFrom(USER).where(USER.UID.eq(uid)).execute()
+
+    getDSLContext
+      .selectFrom(USER_WAREHOUSE)
+      .where(USER_WAREHOUSE.UID.eq(uid))
+      .fetch()
+      .size shouldBe 0
+  }
+}
diff --git a/sql/changelog.xml b/sql/changelog.xml
index bdba73339de..f6daf9dc33c 100644
--- a/sql/changelog.xml
+++ b/sql/changelog.xml
@@ -68,6 +68,11 @@
         <sqlFile path="sql/updates/31.sql"/>
     </changeSet>
 
+    <!-- Per-user warehouse registrations (#6870) -->
+    <changeSet id="32" author="mengw15">
+        <sqlFile path="sql/updates/32.sql"/>
+    </changeSet>
+
     <!-- example changeSet
     <changeSet id="1" author="author">
         <sqlFile path="sql/updates/1.sql"/>
diff --git a/sql/texera_ddl.sql b/sql/texera_ddl.sql
index 5b62f45edd2..9638d8fe79c 100644
--- a/sql/texera_ddl.sql
+++ b/sql/texera_ddl.sql
@@ -239,6 +239,24 @@ CREATE TABLE IF NOT EXISTS workflow_computing_unit
     FOREIGN KEY (uid) REFERENCES "user"(uid) ON DELETE CASCADE
 );
 
+-- Per-user warehouse registrations (#6870): one row per warehouse a user registered.
+-- Base columns only; the assume-role (BYO-S3) columns come in a later change.
+CREATE TABLE IF NOT EXISTS user_warehouse
+(
+    whid                    SERIAL PRIMARY KEY,
+    uid                     INT          NOT NULL,
+    name                    VARCHAR(128) NOT NULL,
+    warehouse_name          VARCHAR(255) NOT NULL UNIQUE,
+    lakekeeper_warehouse_id UUID,
+    flavor                  VARCHAR(32)  NOT NULL,
+    s3_bucket               VARCHAR(255),
+    s3_endpoint             VARCHAR(255),
+    s3_region               VARCHAR(64),
+    created_at              TIMESTAMPTZ  NOT NULL DEFAULT now(),
+    UNIQUE (uid, name),
+    FOREIGN KEY (uid) REFERENCES "user" (uid) ON DELETE CASCADE
+);
+
 -- virtual_environments table
 CREATE TABLE IF NOT EXISTS virtual_environments
 (
diff --git a/sql/updates/32.sql b/sql/updates/32.sql
new file mode 100644
index 00000000000..a2672a876f4
--- /dev/null
+++ b/sql/updates/32.sql
@@ -0,0 +1,44 @@
+/*
+ * 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.
+ */
+
+\c texera_db
+
+SET search_path TO texera_db;
+
+BEGIN;
+
+-- Per-user warehouse registrations (#6870): one row per warehouse a user registered.
+-- Base columns only; the assume-role (BYO-S3) columns come in a later change.
+CREATE TABLE IF NOT EXISTS user_warehouse
+(
+    whid                    SERIAL PRIMARY KEY,
+    uid                     INT          NOT NULL,
+    name                    VARCHAR(128) NOT NULL,
+    warehouse_name          VARCHAR(255) NOT NULL UNIQUE,
+    lakekeeper_warehouse_id UUID,
+    flavor                  VARCHAR(32)  NOT NULL,
+    s3_bucket               VARCHAR(255),
+    s3_endpoint             VARCHAR(255),
+    s3_region               VARCHAR(64),
+    created_at              TIMESTAMPTZ  NOT NULL DEFAULT now(),
+    UNIQUE (uid, name),
+    FOREIGN KEY (uid) REFERENCES "user" (uid) ON DELETE CASCADE
+);
+
+COMMIT;