fix: post merge

streamyard · Dec 19, 2024 · 0fdae42 · 0fdae42
1 parent 11b5eda
commit 0fdae42
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 233 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/driver/spanner/SpannerDriver.ts b/src/driver/spanner/SpannerDriver.ts
@@ -210,7 +210,10 @@ export class SpannerDriver implements Driver {
      */
     async connect(): Promise<void> {
         this.instance = this.spanner.instance(this.options.instanceId)
-        this.instanceDatabase = this.instance.database(this.options.databaseId, this.options.sessionPool ?? {})
+        this.instanceDatabase = this.instance.database(
+            this.options.databaseId,
+            this.options.sessionPool ?? {},
+        )
     }
 
     /**

diff --git a/src/driver/spanner/SpannerSessionPoolOptions.ts b/src/driver/spanner/SpannerSessionPoolOptions.ts
@@ -3,22 +3,22 @@
  * more: https://github.com/ko3a4ok/nodejs-spanner/blob/aa8e8becf74d41d0de68253c17ebab188b5c7620/src/session-pool.ts#L149
  */
 export interface SpannerSessionPoolOptions {
-    acquireTimeout?: number;
-    concurrency?: number;
-    fail?: boolean;
-    idlesAfter?: number;
-    keepAlive?: number;
-    labels?: { [label: string]: string };
-    max?: number;
-    maxIdle?: number;
-    min?: number;
+    acquireTimeout?: number
+    concurrency?: number
+    fail?: boolean
+    idlesAfter?: number
+    keepAlive?: number
+    labels?: { [label: string]: string }
+    max?: number
+    maxIdle?: number
+    min?: number
     /**
      * @deprecated. Starting from v6.5.0 the same session can be reused for
      * different types of transactions.
      */
-    writes?: number;
-    incStep?: number;
-    databaseRole?: string | null;
+    writes?: number
+    incStep?: number
+    databaseRole?: string | null
 }
 /* Defaults:
     const DEFAULTS: SessionPoolOptions = {

diff --git a/src/entity-manager/MongoEntityManager.ts b/src/entity-manager/MongoEntityManager.ts
@@ -1097,7 +1097,7 @@ export class MongoEntityManager extends EntityManager {
             ) || {}
         if (id) {
             query["_id"] =
-                id instanceof objectIdInstance ? id : new ObjectId(id)
+                id instanceof objectIdInstance ? id : new objectIdInstance(id)
         }
         const cursor = this.createEntityCursor<Entity>(entityClassOrName, query)
         const deleteDateColumn =

diff --git a/src/migration/MigrationExecutor.ts b/src/migration/MigrationExecutor.ts
@@ -517,9 +517,11 @@ export class MigrationExecutor {
                                     .migrationId,
                             }),
                             isGenerated: true,
-                            generationStrategy: this.connection.driver.options.type === "spanner"
-                            ? "uuid"
-                            : "increment",
+                            generationStrategy:
+                                this.connection.driver.options.type ===
+                                "spanner"
+                                    ? "uuid"
+                                    : "increment",
                             isPrimary: true,
                             isNullable: false,
                         },
@@ -670,7 +672,7 @@ export class MigrationExecutor {
             values["name"] = migration.name
         }
 
-        if(this.connection.driver.options.type === "spanner"){
+        if (this.connection.driver.options.type === "spanner") {
             // Spanner cannot auto-generate the id, so we need to provide it
             values["id"] = uuidv4()
         }

diff --git a/src/persistence/SubjectExecutor.ts b/src/persistence/SubjectExecutor.ts
@@ -525,7 +525,8 @@ export class SubjectExecutor {
      * Updates all given subjects in the database.
      */
     protected async executeUpdateOperations(): Promise<void> {
-        const isSpanner = this.queryRunner.connection.driver.options.type === "spanner"
+        const isSpanner =
+            this.queryRunner.connection.driver.options.type === "spanner"
         const updateSubject = async (subject: Subject) => {
             if (!subject.identifier)
                 throw new SubjectWithoutIdentifierError(subject)

diff --git a/src/query-builder/QueryBuilder.ts b/src/query-builder/QueryBuilder.ts
@@ -837,20 +837,6 @@ export abstract class QueryBuilder<Entity extends ObjectLiteral> {
         return ""
     }
 
-    /**
-     * Time travel queries for CockroachDB
-     */
-    protected createTimeTravelQuery(): string {
-        if (
-            this.expressionMap.queryType === "select" &&
-            this.expressionMap.timeTravel
-        ) {
-            return ` AS OF SYSTEM TIME ${this.expressionMap.timeTravel}`
-        }
-
-        return ""
-    }
-
     /**
      * Creates "WHERE" expression.
      */

diff --git a/test/functional/naming-strategy/legacy-oracle-naming-strategy/create-table/create-table.ts b/test/functional/naming-strategy/legacy-oracle-naming-strategy/create-table/create-table.ts