diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c2d594e5..c3bb21ef 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -41,6 +41,8 @@ jobs:
       - uses: actions/checkout@v4
       - name: Select Xcode ${{ matrix.xcode }}
         run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
+      - name: List devices available
+        run: xcrun simctl list --json devices available 'iPhone'
       - name: xcodebuild ${{ matrix.scheme }}
         run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="${{ matrix.scheme }}" xcodebuild-raw
       - name: Output test failures
diff --git a/Examples/Reminders/RemindersLists.swift b/Examples/Reminders/RemindersLists.swift
index 71303b51..56865fc2 100644
--- a/Examples/Reminders/RemindersLists.swift
+++ b/Examples/Reminders/RemindersLists.swift
@@ -12,10 +12,8 @@ class RemindersListsModel {
     RemindersList
       .group(by: \.id)
       .order(by: \.position)
-      .leftJoin(Reminder.all) {
-        $0.id.eq($1.remindersListID) && !$1.isCompleted
-      }
-      .leftJoin(SyncMetadata.all) { $0.recordName.eq($2.recordName) }
+      .leftJoin(Reminder.all) { $0.id.eq($1.remindersListID) && !$1.isCompleted }
+      .leftJoin(SyncMetadata.all) { $0.hasMetadata(in: $2) }
       .select {
         ReminderListState.Columns(
           remindersCount: $1.id.count(),
diff --git a/Sources/SQLiteData/CloudKit/Internal/Metadatabase.swift b/Sources/SQLiteData/CloudKit/Internal/Metadatabase.swift
index e1912ad7..2df3bb08 100644
--- a/Sources/SQLiteData/CloudKit/Internal/Metadatabase.swift
+++ b/Sources/SQLiteData/CloudKit/Internal/Metadatabase.swift
@@ -51,7 +51,7 @@
     migrator.registerMigration("Create Metadata Tables") { db in
       try #sql(
         """
-        CREATE TABLE IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_metadata" (
+        CREATE TABLE "\(raw: .sqliteDataCloudKitSchemaName)_metadata" (
           "recordPrimaryKey" TEXT NOT NULL,
           "recordType" TEXT NOT NULL,
           "recordName" TEXT NOT NULL AS ("recordPrimaryKey" || ':' || "recordType"),
@@ -73,21 +73,21 @@
       .execute(db)
       try #sql(
         """
-        CREATE INDEX IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_metadata_parentRecordName"
+        CREATE INDEX "\(raw: .sqliteDataCloudKitSchemaName)_metadata_parentRecordName"
         ON "\(raw: .sqliteDataCloudKitSchemaName)_metadata"("parentRecordName")
         """
       )
       .execute(db)
       try #sql(
         """
-        CREATE INDEX IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_metadata_isShared"
+        CREATE INDEX "\(raw: .sqliteDataCloudKitSchemaName)_metadata_isShared"
         ON "\(raw: .sqliteDataCloudKitSchemaName)_metadata"("isShared")
         """
       )
       .execute(db)
       try #sql(
         """
-        CREATE TABLE IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_recordTypes" (
+        CREATE TABLE "\(raw: .sqliteDataCloudKitSchemaName)_recordTypes" (
           "tableName" TEXT NOT NULL PRIMARY KEY,
           "schema" TEXT NOT NULL,
           "tableInfo" TEXT NOT NULL
@@ -97,7 +97,7 @@
       .execute(db)
       try #sql(
         """
-        CREATE TABLE IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_stateSerialization" (
+        CREATE TABLE "\(raw: .sqliteDataCloudKitSchemaName)_stateSerialization" (
           "scope" TEXT NOT NULL PRIMARY KEY,
           "data" TEXT NOT NULL
         ) STRICT
@@ -106,7 +106,7 @@
       .execute(db)
       try #sql(
         """
-        CREATE TABLE IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_unsyncedRecordIDs" (
+        CREATE TABLE "\(raw: .sqliteDataCloudKitSchemaName)_unsyncedRecordIDs" (
           "recordName" TEXT NOT NULL,
           "zoneName" TEXT NOT NULL,
           "ownerName" TEXT NOT NULL,
@@ -117,7 +117,7 @@
       .execute(db)
       try #sql(
         """
-        CREATE TABLE IF NOT EXISTS "\(raw: .sqliteDataCloudKitSchemaName)_pendingRecordZoneChanges" (
+        CREATE TABLE "\(raw: .sqliteDataCloudKitSchemaName)_pendingRecordZoneChanges" (
           "pendingRecordZoneChange" BLOB NOT NULL
         ) STRICT
         """
diff --git a/Sources/SQLiteData/CloudKit/SyncMetadata.swift b/Sources/SQLiteData/CloudKit/SyncMetadata.swift
index 316aa9fc..ce79f912 100644
--- a/Sources/SQLiteData/CloudKit/SyncMetadata.swift
+++ b/Sources/SQLiteData/CloudKit/SyncMetadata.swift
@@ -163,8 +163,17 @@
 
   @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
   extension PrimaryKeyedTableDefinition where PrimaryKey.QueryOutput: IdentifierStringConvertible {
-    public var recordName: some QueryExpression<String> {
-      _recordName
+    /// A query expression for whether or not this row has associated sync metadata.
+    ///
+    /// This helper can be useful when joining your tables to the ``SyncMetadata`` table:
+    ///
+    /// ```swift
+    /// RemindersList
+    ///   .leftJoin(SyncMetadata.all) { $0.hasMetadata.in($1) }
+    /// ```
+    public func hasMetadata(in metadata: SyncMetadata.TableColumns) -> some QueryExpression<Bool> {
+      metadata.recordType.eq(QueryValue.tableName)
+        && #sql("\(primaryKey)").eq(metadata.recordPrimaryKey)
     }
   }
 
diff --git a/Sources/SQLiteData/Documentation.docc/Articles/CloudKit.md b/Sources/SQLiteData/Documentation.docc/Articles/CloudKit.md
index 9ef8274a..e9f1ead0 100644
--- a/Sources/SQLiteData/Documentation.docc/Articles/CloudKit.md
+++ b/Sources/SQLiteData/Documentation.docc/Articles/CloudKit.md
@@ -571,7 +571,7 @@ following:
 
 @FetchAll(
   RemindersList
-    .leftJoin(SyncMetadata.all) { $0.recordName.eq($1.recordName) }
+    .leftJoin(SyncMetadata.all) { $0.hasMetadata(in: $1) }
     .select {
       Row.Columns(
         remindersList: $0,
@@ -582,8 +582,8 @@ following:
 var rows
 ```
 
-Here we have used the ``StructuredQueriesCore/PrimaryKeyedTableDefinition/recordName`` helper that
-is defined on all primary key tables so that we can join ``SyncMetadata`` to `RemindersList`.
+Here we have used the ``StructuredQueriesCore/PrimaryKeyedTableDefinition/hasMetadata(in:)`` helper
+that is defined on all primary key tables so that we can join ``SyncMetadata`` to `RemindersList`.
 
 <!--
 ## How SQLiteData handles distributed schema scenarios
diff --git a/Sources/SQLiteData/Documentation.docc/SQLiteData.md b/Sources/SQLiteData/Documentation.docc/SQLiteData.md
index 9ac42efe..53fe4919 100644
--- a/Sources/SQLiteData/Documentation.docc/SQLiteData.md
+++ b/Sources/SQLiteData/Documentation.docc/SQLiteData.md
@@ -305,4 +305,5 @@ with SQLite to take full advantage of GRDB and SQLiteData.
 - ``Dependencies/DependencyValues/defaultSyncEngine``
 - ``IdentifierStringConvertible``
 - ``SyncMetadata``
+- ``StructuredQueriesCore/PrimaryKeyedTableDefinition/hasMetadata(in:)``
 - ``SharedRecord``
diff --git a/Tests/SQLiteDataTests/CloudKitTests/MetadataTests.swift b/Tests/SQLiteDataTests/CloudKitTests/MetadataTests.swift
index 6559843e..d16b2ba2 100644
--- a/Tests/SQLiteDataTests/CloudKitTests/MetadataTests.swift
+++ b/Tests/SQLiteDataTests/CloudKitTests/MetadataTests.swift
@@ -488,6 +488,82 @@
           """
         }
       }
+
+      @available(iOS 17, macOS 14, tvOS 17, watchOS 10, *)
+      @Test func hasMetadataHelper() async throws {
+        try await userDatabase.userWrite { db in
+          try db.seed {
+            RemindersList(id: 1, title: "Personal")
+            RemindersList(id: 2, title: "Work")
+            Reminder(id: 1, title: "Groceries", remindersListID: 1)
+          }
+        }
+
+        try await syncEngine.processPendingRecordZoneChanges(scope: .private)
+
+        assertQuery(
+          RemindersList.join(SyncMetadata.all) { $0.hasMetadata(in: $1) },
+          database: userDatabase.database
+        ) {
+          """
+          ┌─────────────────────┬────────────────────────────────────────────────────────────────────┐
+          │ RemindersList(      │ SyncMetadata(                                                      │
+          │   id: 1,            │   recordPrimaryKey: "1",                                           │
+          │   title: "Personal" │   recordType: "remindersLists",                                    │
+          │ )                   │   recordName: "1:remindersLists",                                  │
+          │                     │   parentRecordPrimaryKey: nil,                                     │
+          │                     │   parentRecordType: nil,                                           │
+          │                     │   parentRecordName: nil,                                           │
+          │                     │   lastKnownServerRecord: CKRecord(                                 │
+          │                     │     recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__), │
+          │                     │     recordType: "remindersLists",                                  │
+          │                     │     parent: nil,                                                   │
+          │                     │     share: nil                                                     │
+          │                     │   ),                                                               │
+          │                     │   _lastKnownServerRecordAllFields: CKRecord(                       │
+          │                     │     recordID: CKRecord.ID(1:remindersLists/zone/__defaultOwner__), │
+          │                     │     recordType: "remindersLists",                                  │
+          │                     │     parent: nil,                                                   │
+          │                     │     share: nil,                                                    │
+          │                     │     id: 1,                                                         │
+          │                     │     title: "Personal"                                              │
+          │                     │   ),                                                               │
+          │                     │   share: nil,                                                      │
+          │                     │   _isDeleted: false,                                               │
+          │                     │   isShared: false,                                                 │
+          │                     │   userModificationDate: Date(1970-01-01T00:00:00.000Z)             │
+          │                     │ )                                                                  │
+          ├─────────────────────┼────────────────────────────────────────────────────────────────────┤
+          │ RemindersList(      │ SyncMetadata(                                                      │
+          │   id: 2,            │   recordPrimaryKey: "2",                                           │
+          │   title: "Work"     │   recordType: "remindersLists",                                    │
+          │ )                   │   recordName: "2:remindersLists",                                  │
+          │                     │   parentRecordPrimaryKey: nil,                                     │
+          │                     │   parentRecordType: nil,                                           │
+          │                     │   parentRecordName: nil,                                           │
+          │                     │   lastKnownServerRecord: CKRecord(                                 │
+          │                     │     recordID: CKRecord.ID(2:remindersLists/zone/__defaultOwner__), │
+          │                     │     recordType: "remindersLists",                                  │
+          │                     │     parent: nil,                                                   │
+          │                     │     share: nil                                                     │
+          │                     │   ),                                                               │
+          │                     │   _lastKnownServerRecordAllFields: CKRecord(                       │
+          │                     │     recordID: CKRecord.ID(2:remindersLists/zone/__defaultOwner__), │
+          │                     │     recordType: "remindersLists",                                  │
+          │                     │     parent: nil,                                                   │
+          │                     │     share: nil,                                                    │
+          │                     │     id: 2,                                                         │
+          │                     │     title: "Work"                                                  │
+          │                     │   ),                                                               │
+          │                     │   share: nil,                                                      │
+          │                     │   _isDeleted: false,                                               │
+          │                     │   isShared: false,                                                 │
+          │                     │   userModificationDate: Date(1970-01-01T00:00:00.000Z)             │
+          │                     │ )                                                                  │
+          └─────────────────────┴────────────────────────────────────────────────────────────────────┘
+          """
+        }
+      }
     }
   }
 #endif
diff --git a/Tests/SharingGRDBTests/CloudKitTests/UnattachedSyncEngineTests.swift b/Tests/SQLiteDataTests/CloudKitTests/UnattachedSyncEngineTests.swift
similarity index 100%
rename from Tests/SharingGRDBTests/CloudKitTests/UnattachedSyncEngineTests.swift
rename to Tests/SQLiteDataTests/CloudKitTests/UnattachedSyncEngineTests.swift