archive-gh-me/typeorm
1
0
Fork 0
mirror of https://github.com/typeorm/typeorm.git synced 2025-12-08 21:26:23 +00:00
Code Issues Projects Releases Wiki Activity

oracle driver updates

Browse Source
This commit is contained in:
Umed Khudoiberdiev 2016-09-16 16:33:28 +05:00
parent b37f15e36a
commit f13d286910
4 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sample/sample1-simple-entity/app.ts
View File

@ -10,22 +10,23 @@ const options: ConnectionOptions = {
// username: "root",
// password: "admin",
// database: "test"
// type: "oracle",
// host: "localhost",
// username: "system",
// password: "oracle",
// sid: "xe.oracle.docker",
type: "oracle",
host: "localhost",
username: "system",
password: "oracle",
port: 1521,
sid: "xe.oracle.docker",
// type: "mssql",
// host: "192.168.1.10",
// username: "sa",
// password: "admin12345",
// database: "test",
// port: 1521
type: "sqlite",
storage: "temp/sqlitedb.db"
// type: "sqlite",
// storage: "temp/sqlitedb.db"
},
logging: {
// logQueries: true,
logQueries: true,
logSchemaCreation: true
},
autoSchemaCreate: true,

8
src/driver/oracle/OracleDriver.ts
View File

@ -78,6 +78,8 @@ export class OracleDriver implements Driver {
// if oracle package instance was not set explicitly then try to load it
if (!oracle)
this.loadDependencies();
this.oracle.outFormat = this.oracle.OBJECT;
}
// -------------------------------------------------------------------------
@ -195,21 +197,21 @@ export class OracleDriver implements Driver {
* Escapes a column name.
*/
escapeColumnName(columnName: string): string {
return columnName; // "`" + columnName + "`";
return `"${columnName}"`; // "`" + columnName + "`";
}
/**
* Escapes an alias.
*/
escapeAliasName(aliasName: string): string {
return aliasName; // "`" + aliasName + "`";
return `"${aliasName}"`;
}
/**
* Escapes a table name.
*/
escapeTableName(tableName: string): string {
return tableName; // "`" + tableName + "`";
return `"${tableName}"`;
}
/**

45
src/driver/oracle/OracleQueryRunner.ts
View File

@ -139,7 +139,7 @@ export class OracleQueryRunner implements QueryRunner {
return fail(err);
}
ok(result);
ok(result.rows);
};
const executionOptions = {
autoCommit: this.databaseConnection.isTransactionActive ? false : true
@ -147,7 +147,7 @@ export class OracleQueryRunner implements QueryRunner {
if (parameters instanceof Array && parameters.length) {
this.databaseConnection.connection.execute(query, parameters, executionOptions, handler);
} else {
this.databaseConnection.connection.execute(query, executionOptions, handler);
this.databaseConnection.connection.execute(query, {}, executionOptions, handler);
}
});
}
@ -161,12 +161,19 @@ export class OracleQueryRunner implements QueryRunner {
const keys = Object.keys(keyValues);
const columns = keys.map(key => this.driver.escapeColumnName(key)).join(", ");
const values = keys.map(key => ":" + key).join(",");
const values = keys.map(key => ":" + key).join(", ");
const parameters = keys.map(key => keyValues[key]);
const sql = `INSERT INTO ${this.driver.escapeTableName(tableName)}(${columns}) VALUES (${values}) ${ generatedColumn ? " RETURNING " + this.driver.escapeColumnName(generatedColumn.name) : "" }`;
const sql = `INSERT INTO ${this.driver.escapeTableName(tableName)}(${columns}) VALUES (${values})`;
const result = await this.query(sql, parameters);
if (generatedColumn)
return result[0][generatedColumn.name];
if (generatedColumn) {
const sequenceNameResults = await this.query(`SELECT * FROM USER_TAB_COLUMNS WHERE TABLE_NAME = 'sample1_post' AND COLUMN_NAME = 'id'`);
console.log("sequenceNameResults: ", sequenceNameResults);
const sequenceName = sequenceNameResults[0]["DATA_DEFAULT"].replace("nextval", "currval");
console.log(sequenceName);
const idResults = await this.query(`SELECT ${sequenceName} ID FROM DUAL`);
console.log(idResults);
return idResults[0]["id"];
}
return result;
}
@ -311,10 +318,10 @@ export class OracleQueryRunner implements QueryRunner {
throw new QueryRunnerAlreadyReleasedError();
const columnDefinitions = table.columns.map(column => this.buildCreateColumnSql(column, false)).join(", ");
let sql = `CREATE TABLE \`${table.name}\` (${columnDefinitions}`;
let sql = `CREATE TABLE "${table.name}" (${columnDefinitions}`;
const primaryKeyColumns = table.columns.filter(column => column.isPrimary);
if (primaryKeyColumns.length > 0)
sql += `, PRIMARY KEY(${primaryKeyColumns.map(column => `\`${column.name}\``).join(", ")})`;
sql += `, PRIMARY KEY(${primaryKeyColumns.map(column => `"${column.name}"`).join(", ")})`;
sql += `)`;
await this.query(sql);
}
@ -369,7 +376,7 @@ export class OracleQueryRunner implements QueryRunner {
if (this.isReleased)
throw new QueryRunnerAlreadyReleasedError();
const primaryColumnNames = dbTable.primaryKeys.map(primaryKey => "`" + primaryKey.columnName + "`");
const primaryColumnNames = dbTable.primaryKeys.map(primaryKey => "\"" + primaryKey.columnName + "\"");
await this.query(`ALTER TABLE ${dbTable.name} DROP PRIMARY KEY`);
if (primaryColumnNames.length > 0)
await this.query(`ALTER TABLE ${dbTable.name} ADD PRIMARY KEY (${primaryColumnNames.join(", ")})`);
@ -383,8 +390,8 @@ export class OracleQueryRunner implements QueryRunner {
throw new QueryRunnerAlreadyReleasedError();
const promises = foreignKeys.map(foreignKey => {
const columnNames = foreignKey.columnNames.map(column => "`" + column + "`").join(", ");
const referencedColumnNames = foreignKey.referencedColumnNames.map(column => "`" + column + "`").join(",");
const columnNames = foreignKey.columnNames.map(column => "\"" + column + "\"").join(", ");
const referencedColumnNames = foreignKey.referencedColumnNames.map(column => "\"" + column + "\"").join(",");
let sql = `ALTER TABLE ${dbTable.name} ADD CONSTRAINT "${foreignKey.name}" ` +
`FOREIGN KEY (${columnNames}) ` +
`REFERENCES "${foreignKey.referencedTableName}"(${referencedColumnNames})`;
@ -417,7 +424,7 @@ export class OracleQueryRunner implements QueryRunner {
if (this.isReleased)
throw new QueryRunnerAlreadyReleasedError();
const columns = index.columnNames.map(columnName => "`" + columnName + "`").join(", ");
const columns = index.columnNames.map(columnName => "\"" + columnName + "\"").join(", ");
const sql = `CREATE ${index.isUnique ? "UNIQUE" : ""} INDEX "${index.name}" ON "${index.tableName}"(${columns})`;
await this.query(sql);
}
@ -514,14 +521,14 @@ export class OracleQueryRunner implements QueryRunner {
*/
protected buildCreateColumnSql(column: ColumnSchema, skipPrimary: boolean) {
let c = `"${column.name}" ` + column.type;
if (column.isNullable !== true)
if (column.isNullable !== true && !column.isGenerated) // NOT NULL is not supported with GENERATED
c += " NOT NULL";
if (column.isPrimary === true && !skipPrimary)
c += " PRIMARY KEY";
// if (column.isGenerated === true) // don't use skipPrimary here since updates can update already exist primary without auto inc.
// c += " GENERATED BY DEFAULT ON NULL AS IDENTITY";
if (column.comment)
c += " COMMENT '" + column.comment + "'";
// if (column.isPrimary === true && !skipPrimary)
// c += " PRIMARY KEY";
if (column.isGenerated === true) // don't use skipPrimary here since updates can update already exist primary without auto inc.
c += " GENERATED BY DEFAULT ON NULL AS IDENTITY";
// if (column.comment) // todo: less priority, fix it later
// c += " COMMENT '" + column.comment + "'";
return c;
}

2
src/driver/sqlserver/SqlServerDriver.ts
View File

@ -181,7 +181,7 @@ export class SqlServerDriver implements Driver {
* Escapes a column name.
*/
escapeColumnName(columnName: string): string {
return columnName; // "`" + columnName + "`";
return `"${columnName}"`;
}
/**