From a0552db8645cff9f1667603d4d7b746fabd84c88 Mon Sep 17 00:00:00 2001 From: Javier De La Fuente Sales <123395506+javierdelafuentesales@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:04:57 +0100 Subject: [PATCH] feat: temporally point to our spanner fork (#16) --- README.md | 4 ++-- package-lock.json | 4 ++-- package.json | 2 +- src/commands/InitCommand.ts | 2 +- src/driver/spanner/SpannerConnectionOptions.ts | 4 ++-- src/driver/spanner/SpannerDriver.ts | 13 ++++++++----- src/platform/PlatformTools.ts | 2 +- 7 files changed, 17 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 69dcf52b19..7de622060b 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ const firstUser = await User.findOneBy({ }) const timber = await User.findOneBy({ firstName: "Timber", - lastName: "Saw" + lastName: "Saw", }) await timber.remove() @@ -222,7 +222,7 @@ await timber.remove() - for **Google Cloud Spanner** ``` - npm install @google-cloud/spanner --save + npm install @streamyard/spanner --save ``` Provide authentication credentials to your application code diff --git a/package-lock.json b/package-lock.json index aa9f3469a8..9e287975a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@streamyard/typeorm", - "version": "0.3.16-5-beta2", + "version": "0.3.16-5-beta3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@streamyard/typeorm", - "version": "0.3.16-5-beta2", + "version": "0.3.16-5-beta3", "license": "MIT", "dependencies": { "@sqltools/formatter": "^1.2.5", diff --git a/package.json b/package.json index 5896840ea8..bd8841b88e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@streamyard/typeorm", "private": true, - "version": "0.3.16-5-beta2", + "version": "0.3.16-5-beta3", "description": "Data-Mapper ORM for TypeScript, ES7, ES6, ES5. Supports MySQL, PostgreSQL, MariaDB, SQLite, MS SQL Server, Oracle, MongoDB, Spanner databases.", "license": "MIT", "readmeFilename": "README.md", diff --git a/src/commands/InitCommand.ts b/src/commands/InitCommand.ts index 8a14d2738f..8c05cf03c0 100644 --- a/src/commands/InitCommand.ts +++ b/src/commands/InitCommand.ts @@ -729,7 +729,7 @@ Steps to run this project: packageJson.dependencies["mongodb"] = "^5.2.0" break case "spanner": - packageJson.dependencies["@google-cloud/spanner"] = "^5.18.0" + packageJson.dependencies["@streamyard/spanner"] = "^5.18.0" break } diff --git a/src/driver/spanner/SpannerConnectionOptions.ts b/src/driver/spanner/SpannerConnectionOptions.ts index ce3b304fcb..879e20fb87 100644 --- a/src/driver/spanner/SpannerConnectionOptions.ts +++ b/src/driver/spanner/SpannerConnectionOptions.ts @@ -7,7 +7,7 @@ import { SpannerSessionPoolOptions } from "./SpannerSessionPoolOptions" */ export interface SpannerConnectionOptions extends BaseConnectionOptions, - SpannerConnectionCredentialsOptions { + SpannerConnectionCredentialsOptions { /** * Database type. */ @@ -15,7 +15,7 @@ export interface SpannerConnectionOptions /** * The driver object - * This defaults to require("@google-cloud/spanner"). + * This defaults to require("@streamyard/spanner"). */ readonly driver?: any diff --git a/src/driver/spanner/SpannerDriver.ts b/src/driver/spanner/SpannerDriver.ts index a21c50c85b..629a3cc648 100644 --- a/src/driver/spanner/SpannerDriver.ts +++ b/src/driver/spanner/SpannerDriver.ts @@ -205,7 +205,10 @@ export class SpannerDriver implements Driver { */ async connect(): Promise { 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 ?? {}, + ) } /** @@ -422,9 +425,9 @@ export class SpannerDriver implements Driver { if (value === null || value === undefined) return columnMetadata.transformer ? ApplyValueTransformers.transformFrom( - columnMetadata.transformer, - value, - ) + columnMetadata.transformer, + value, + ) : value if (columnMetadata.type === Boolean || columnMetadata.type === "bool") { @@ -737,7 +740,7 @@ export class SpannerDriver implements Driver { console.error(e) throw new DriverPackageNotInstalledError( "Spanner", - "@google-cloud/spanner", + "@streamyard/spanner", ) } } diff --git a/src/platform/PlatformTools.ts b/src/platform/PlatformTools.ts index dc7d5c16c9..3e1d931fa8 100644 --- a/src/platform/PlatformTools.ts +++ b/src/platform/PlatformTools.ts @@ -40,7 +40,7 @@ export class PlatformTools { * spanner */ case "spanner": - return require("@google-cloud/spanner") + return require("@streamyard/spanner") /** * mongodb