Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SOA-704] feat(app): Add Session Pool Options to the Spanner connection #11

Merged
merged 2 commits into from
Aug 24, 2023
+49 −8
Merged

[SOA-704] feat(app): Add Session Pool Options to the Spanner connection #11

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e429117
Add Session Pool Options to the Spanner connection
MuFa117 Aug 23, 2023
aab3807
One formatting too much
MuFa117 Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
One formatting too much
@MuFa117
MuFa117 committed Aug 23, 2023
commit aab3807926a3a3770ea196307f5e1902d4608b92
79 changes: 42 additions & 37 deletions src/driver/spanner/SpannerQueryRunner.ts
View file
Original file line number Diff line number Diff line change
@@ -160,15 +160,15 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
await this.connect()
let rawResult:
| [
any[],
{
queryPlan: null
queryStats: null
rowCountExact: string
rowCount: string
},
{ rowType: { fields: [] }; transaction: null },
]
any[],
{
queryPlan: null
queryStats: null
rowCountExact: string
rowCount: string
},
{ rowType: { fields: [] }; transaction: null },
]
| undefined = undefined
const isSelect = query.startsWith("SELECT")
const executor =
@@ -186,9 +186,9 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
sql: query,
params: parameters
? parameters.reduce((params, value, index) => {
params["param" + index] = value
return params
}, {} as ObjectLiteral)
params["param" + index] = value
return params
}, {} as ObjectLiteral)
: undefined,
json: true,
})
@@ -200,7 +200,7 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
// we throw original error even if rollback thrown an error
if (!this.isTransactionActive && !isSelect)
await this.sessionTransaction.rollback()
} catch (rollbackError) { }
} catch (rollbackError) {}
throw error
}

@@ -304,9 +304,9 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
sql: query,
params: parameters
? parameters.reduce((params, value, index) => {
params["param" + index] = value
return params
}, {} as ObjectLiteral)
params["param" + index] = value
return params
}, {} as ObjectLiteral)
: undefined,
json: true,
}
@@ -785,8 +785,8 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
oldTableColumnOrName instanceof TableColumn
? oldTableColumnOrName
: table.columns.find(
(column) => column.name === oldTableColumnOrName,
)
(column) => column.name === oldTableColumnOrName,
)
if (!oldColumn)
throw new TypeORMError(
`Column "${oldTableColumnOrName}" was not found in the "${table.name}" table.`,
@@ -813,13 +813,15 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
) {
upQueries.push(
new Query(
`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name
`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${
newColumn.name
}" TYPE ${this.driver.createFullType(newColumn)}`,
),
)
downQueries.push(
new Query(
`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${newColumn.name
`ALTER TABLE ${this.escapePath(table)} ALTER COLUMN "${
newColumn.name
}" TYPE ${this.driver.createFullType(oldColumn)}`,
),
)
@@ -1469,7 +1471,7 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
// we throw original error even if rollback thrown an error
if (!isAnotherTransactionActive)
await this.rollbackTransaction()
} catch (rollbackError) { }
} catch (rollbackError) {}
throw error
}
}
@@ -1654,9 +1656,9 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
(dbIndex) => {
return (
dbIndex["TABLE_NAME"] ===
dbTable["TABLE_NAME"] &&
dbTable["TABLE_NAME"] &&
dbIndex["COLUMN_NAME"] ===
dbColumn["COLUMN_NAME"] &&
dbColumn["COLUMN_NAME"] &&
dbIndex["IS_UNIQUE"] === true
)
},
@@ -1676,7 +1678,7 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
(uniqueIndex) => {
return (
index.name ===
uniqueIndex["INDEX_NAME"] &&
uniqueIndex["INDEX_NAME"] &&
index.synchronize === false
)
},
@@ -1688,9 +1690,9 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
return dbIndices.some(
(dbIndex) =>
dbIndex["INDEX_NAME"] ===
uniqueIndex["INDEX_NAME"] &&
uniqueIndex["INDEX_NAME"] &&
dbIndex["COLUMN_NAME"] !==
dbColumn["COLUMN_NAME"],
dbColumn["COLUMN_NAME"],
)
})

@@ -1762,9 +1764,9 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
(dbPrimaryKey) => {
return (
dbPrimaryKey["TABLE_NAME"] ===
dbColumn["TABLE_NAME"] &&
dbColumn["TABLE_NAME"] &&
dbPrimaryKey["COLUMN_NAME"] ===
dbColumn["COLUMN_NAME"]
dbColumn["COLUMN_NAME"]
)
},
)
@@ -1921,9 +1923,9 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
const checkName = check.name
? check.name
: this.connection.namingStrategy.checkConstraintName(
table,
check.expression!,
)
table,
check.expression!,
)
return `CONSTRAINT \`${checkName}\` CHECK (${check.expression})`
})
.join(", ")
@@ -1948,10 +1950,11 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
.map((columnName) => `\`${columnName}\``)
.join(", ")

return `CONSTRAINT \`${fk.name
}\` FOREIGN KEY (${columnNames}) REFERENCES ${this.escapePath(
this.getTablePath(fk),
)} (${referencedColumnNames})`
return `CONSTRAINT \`${
fk.name
}\` FOREIGN KEY (${columnNames}) REFERENCES ${this.escapePath(
this.getTablePath(fk),
)} (${referencedColumnNames})`
})
.join(", ")

@@ -2071,7 +2074,8 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
checkConstraint: TableCheck,
): Query {
return new Query(
`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${checkConstraint.name
`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${
checkConstraint.name
}\` CHECK (${checkConstraint.expression})`,
)
}
@@ -2106,7 +2110,8 @@ export class SpannerQueryRunner extends BaseQueryRunner implements QueryRunner {
.map((column) => this.driver.escape(column))
.join(",")
let sql =
`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${foreignKey.name
`ALTER TABLE ${this.escapePath(table)} ADD CONSTRAINT \`${
foreignKey.name
}\` FOREIGN KEY (${columnNames}) ` +
`REFERENCES ${this.escapePath(
this.getTablePath(foreignKey),