velocious 1.0.615 → 1.0.617

package/build/testing/test-runner.js

@@ -1307,26 +1307,33 @@ export default class TestRunner {
                     })
                   } finally {
                     try {
-                      if (testSharedConnectionsActive) {
-                        this.clearTestSharedConnections(testSharedConnectionRegistrations)
-                        testSharedConnectionRegistrations = []
-                        testSharedConnectionsActive = false
-                      }
+                      // Framework-owned post-commit broadcasts are intentionally
+                      // detached; drain them before test cleanup so their DB
+                      // checkouts cannot leak into the next test's lifecycle.
+                      await this.getConfiguration().awaitPendingBroadcasts()
                     } finally {
                       try {
-                        await this.stopSharedTransactionBroker(sharedTransactionBrokerRegistration || sharedTransactionBrokerPreparation)
-                        sharedTransactionBrokerRegistration = undefined
-                        sharedTransactionBrokerPreparation = undefined
+                        if (testSharedConnectionsActive) {
+                          this.clearTestSharedConnections(testSharedConnectionRegistrations)
+                          testSharedConnectionRegistrations = []
+                          testSharedConnectionsActive = false
+                        }
                       } finally {
-                        for (const afterEachData of newAfterEaches) {
-                          await this.runProfileSpan({
-                            phase: "afterEach",
-                            declarationIndex: afterEachData.declarationIndex,
-                            declarationScopeId: afterEachData.declarationScopeId,
-                            filePath: afterEachData.ownerFilePath
-                          }, async () => {
-                            await afterEachData.callback({configuration: this.getConfiguration(), testArgs, testData})
-                          })
+                        try {
+                          await this.stopSharedTransactionBroker(sharedTransactionBrokerRegistration || sharedTransactionBrokerPreparation)
+                          sharedTransactionBrokerRegistration = undefined
+                          sharedTransactionBrokerPreparation = undefined
+                        } finally {
+                          for (const afterEachData of newAfterEaches) {
+                            await this.runProfileSpan({
+                              phase: "afterEach",
+                              declarationIndex: afterEachData.declarationIndex,
+                              declarationScopeId: afterEachData.declarationScopeId,
+                              filePath: afterEachData.ownerFilePath
+                            }, async () => {
+                              await afterEachData.callback({configuration: this.getConfiguration(), testArgs, testData})
+                            })
+                          }
                         }
                       }
                     }

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "build/bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.615",
+  "version": "1.0.617",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "files": [

package/src/database/record/index.js

@@ -3992,6 +3992,20 @@ class VelociousDatabaseRecord {
         } else {
           throw new Error(`Unexpected loaded type: ${typeof loadedModels}`)
         }
+      } else if (instanceRelationship.getType() == "hasOne") {
+        if (!instanceRelationship.isLoaded()) {
+          await instanceRelationship.load()
+        }
+
+        const loadedModel = instanceRelationship.loaded()
+
+        if (loadedModel instanceof VelociousDatabaseRecord) {
+          models = [loadedModel]
+        } else if (loadedModel === undefined) {
+          models = []
+        } else {
+          throw new Error(`Unexpected loaded type: ${typeof loadedModel}`)
+        }
       } else {
         throw new Error(`Unhandled relationship type: ${instanceRelationship.getType()}`)
       }

package/src/database/record/instance-relationships/has-one.js

@@ -66,6 +66,12 @@ export default class VelociousDatabaseRecordHasOneInstanceRelationship extends B
 
     whereArgs[foreignKey] = primaryModelID
 
+    if (this.getRelationship().getPolymorphic()) {
+      const typeColumn = this.getRelationship().getPolymorphicTypeColumn()
+
+      whereArgs[typeColumn] = this.getModel().getModelClass().getModelName()
+    }
+
     let query = this.getModel().queryForModel(TargetModelClass).where(whereArgs)
 
     query = this.applyScope(query)

package/src/testing/test-runner.js

@@ -1307,26 +1307,33 @@ export default class TestRunner {
                     })
                   } finally {
                     try {
-                      if (testSharedConnectionsActive) {
-                        this.clearTestSharedConnections(testSharedConnectionRegistrations)
-                        testSharedConnectionRegistrations = []
-                        testSharedConnectionsActive = false
-                      }
+                      // Framework-owned post-commit broadcasts are intentionally
+                      // detached; drain them before test cleanup so their DB
+                      // checkouts cannot leak into the next test's lifecycle.
+                      await this.getConfiguration().awaitPendingBroadcasts()
                     } finally {
                       try {
-                        await this.stopSharedTransactionBroker(sharedTransactionBrokerRegistration || sharedTransactionBrokerPreparation)
-                        sharedTransactionBrokerRegistration = undefined
-                        sharedTransactionBrokerPreparation = undefined
+                        if (testSharedConnectionsActive) {
+                          this.clearTestSharedConnections(testSharedConnectionRegistrations)
+                          testSharedConnectionRegistrations = []
+                          testSharedConnectionsActive = false
+                        }
                       } finally {
-                        for (const afterEachData of newAfterEaches) {
-                          await this.runProfileSpan({
-                            phase: "afterEach",
-                            declarationIndex: afterEachData.declarationIndex,
-                            declarationScopeId: afterEachData.declarationScopeId,
-                            filePath: afterEachData.ownerFilePath
-                          }, async () => {
-                            await afterEachData.callback({configuration: this.getConfiguration(), testArgs, testData})
-                          })
+                        try {
+                          await this.stopSharedTransactionBroker(sharedTransactionBrokerRegistration || sharedTransactionBrokerPreparation)
+                          sharedTransactionBrokerRegistration = undefined
+                          sharedTransactionBrokerPreparation = undefined
+                        } finally {
+                          for (const afterEachData of newAfterEaches) {
+                            await this.runProfileSpan({
+                              phase: "afterEach",
+                              declarationIndex: afterEachData.declarationIndex,
+                              declarationScopeId: afterEachData.declarationScopeId,
+                              filePath: afterEachData.ownerFilePath
+                            }, async () => {
+                              await afterEachData.callback({configuration: this.getConfiguration(), testArgs, testData})
+                            })
+                          }
                         }
                       }
                     }