Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add support for 'CASCADE' in PostgreSQL 'DROP SCHEMA' queries #3627

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

Closed
wants to merge 2 commits into from
Closed

Add support for 'CASCADE' in PostgreSQL 'DROP SCHEMA' queries #3627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f1cda1
Add support for 'CASCADE' in PostgreSQL 'DROP SCHEMA' queries
SteveDeWald Jan 16, 2020
98e1e80
Mark cascade parameter optional on dropSchema
SteveDeWald Jan 27, 2020
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
16 changes: 12 additions & 4 deletions lib/dialects/postgres/schema/compiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,20 @@ SchemaCompiler_PG.prototype.createSchemaIfNotExists = function(schemaName) {
);
};

SchemaCompiler_PG.prototype.dropSchema = function(schemaName) {
this.pushQuery(`drop schema ${this.formatter.wrap(schemaName)}`);
SchemaCompiler_PG.prototype.dropSchema = function(schemaName, cascade = false) {
this.pushQuery(
`drop schema ${this.formatter.wrap(schemaName)}${cascade && ' CASCADE'}`
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this will work correct for cascade = false?
can you add unit test on this?

);
};

SchemaCompiler_PG.prototype.dropSchemaIfExists = function(schemaName) {
this.pushQuery(`drop schema if exists ${this.formatter.wrap(schemaName)}`);
SchemaCompiler_PG.prototype.dropSchemaIfExists = function(
schemaName,
cascade = false
) {
this.pushQuery(
`drop schema if exists ${this.formatter.wrap(schemaName)}${cascade &&
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would evaluate to drop schema if exists <tablename>false when cascade is false.

Please change to a ternary-operation.

drop schema if exists ${this.formatter.wrap(schemaName)}${cascade ? ' CASCADE' : ''}

' CASCADE'}`
);
};

SchemaCompiler_PG.prototype.dropExtension = function(extensionName) {
Expand Down
4 changes: 2 additions & 2 deletions types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1498,8 +1498,8 @@ declare namespace Knex {
callback: (tableBuilder: AlterTableBuilder) => any
): Promise<void>;
dropTableIfExists(tableName: string): SchemaBuilder;
dropSchema(schemaName: string): SchemaBuilder;
dropSchemaIfExists(schemaName: string): SchemaBuilder;
dropSchema(schemaName: string, cascade?: boolean): SchemaBuilder;
dropSchemaIfExists(schemaName: string, cascade?: boolean): SchemaBuilder;
raw(statement: string): SchemaBuilder;
withSchema(schemaName: string): SchemaBuilder;
queryContext(context: any): SchemaBuilder;
Expand Down