Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 15 additions & 2 deletions src/driver/sap/SapQueryRunner.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
return this.driver.master.release(this.databaseConnection);
}

return Promise.resolve();
return Promise.resolve();
}

/**
Expand Down Expand Up @@ -466,6 +466,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["DELETE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["DELETE_RULE"],
onUpdate: dbForeignKey["UPDATE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["UPDATE_RULE"],
deferrable: dbForeignKey["CHECK_TIME"].replace("_", " "), // "CHECK_TIME" is "INITIALLY_IMMEDIATE" or "INITIALLY DEFERRED"
});
});

Expand Down Expand Up @@ -571,6 +572,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["DELETE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["DELETE_RULE"],
onUpdate: dbForeignKey["UPDATE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["UPDATE_RULE"],
deferrable: dbForeignKey["CHECK_TIME"].replace("_", " "),
});
});

Expand Down Expand Up @@ -906,6 +908,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["DELETE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["DELETE_RULE"],
onUpdate: dbForeignKey["UPDATE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["UPDATE_RULE"],
deferrable: dbForeignKey["CHECK_TIME"].replace("_", " "),
});
});

Expand Down Expand Up @@ -1041,6 +1044,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["DELETE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["DELETE_RULE"],
onUpdate: dbForeignKey["UPDATE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["UPDATE_RULE"],
deferrable: dbForeignKey["CHECK_TIME"].replace("_", " "),
});
});

Expand Down Expand Up @@ -1109,6 +1113,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["DELETE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["DELETE_RULE"],
onUpdate: dbForeignKey["UPDATE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["UPDATE_RULE"],
deferrable: dbForeignKey["CHECK_TIME"].replace("_", " "),
});
});

Expand Down Expand Up @@ -1627,6 +1632,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
referencedColumnNames: foreignKeys.map(dbFk => dbFk["REFERENCED_COLUMN_NAME"]),
onDelete: dbForeignKey["DELETE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["DELETE_RULE"],
onUpdate: dbForeignKey["UPDATE_RULE"] === "RESTRICT" ? "NO ACTION" : dbForeignKey["UPDATE_RULE"],
deferrable: dbForeignKey["CHECK_TIME"].replace("_", " "),
});
});

Expand Down Expand Up @@ -1720,6 +1726,9 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
const onUpdate = fk.onUpdate === "NO ACTION" ? "RESTRICT" : fk.onUpdate;
constraint += ` ON UPDATE ${onUpdate}`;
}
if (fk.deferrable) {
constraint += ` ${fk.deferrable}`;
}

return constraint;
}).join(", ");
Expand Down Expand Up @@ -1823,7 +1832,7 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
let indexType = "";
if (index.isUnique) {
indexType += "UNIQUE ";
}
}
if (index.isFulltext) {
indexType += "FULLTEXT ";
}
Expand Down Expand Up @@ -1896,6 +1905,10 @@ export class SapQueryRunner extends BaseQueryRunner implements QueryRunner {
sql += ` ON UPDATE ${onUpdate}`;
}

if (foreignKey.deferrable) {
sql += ` ${foreignKey.deferrable}`;
}

return new Query(sql);
}

Expand Down