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

Jump to bottom

Improve renameColumn generated SQL on mssql #783

Merged
merged 5 commits into from Jul 20, 2022
Merged

Improve renameColumn generated SQL on mssql #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5ff5364
Update to RenameColumnGenerator.generateSql
mide25 Jul 4, 2018
8a13aeb
Merge branch 'master' into patch-1
nvoxland Jul 12, 2022
6fa0513
Merge branch 'master' into patch-1
nvoxland Jul 13, 2022
d3a76aa
Updated expected SQL
nvoxland Jul 13, 2022
7b2c9f5
Updated expected SQL
nvoxland Jul 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion liquibase-core/src/main/java/liquibase/sqlgenerator/core/RenameColumnGenerator.java
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ public Sql[] generateSql(RenameColumnStatement statement, Database database, Sql
String sql;
if (database instanceof MSSQLDatabase) {
// do no escape the new column name. Otherwise it produce "exec sp_rename '[dbo].[person].[usernae]', '[username]'"
sql = "exec sp_rename '" + database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName()) + "." + database.escapeColumnName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName(), statement.getOldColumnName()) + "', '" + statement.getNewColumnName() + "'";
sql = "exec sp_rename '" + database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName()) + "." + database.escapeColumnName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName(), statement.getOldColumnName()) + "', '" + statement.getNewColumnName() + "', 'COLUMN'";
} else if (database instanceof MySQLDatabase) {
sql ="ALTER TABLE " + database.escapeTableName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName()) + " CHANGE " + database.escapeColumnName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName(), statement.getOldColumnName()) + " " + database.escapeColumnName(statement.getCatalogName(), statement.getSchemaName(), statement.getTableName(), statement.getNewColumnName()) + " " + DataTypeFactory.getInstance().fromDescription(statement.getColumnDataType(), database).toDatabaseDataType(database);
} else if (database instanceof SybaseDatabase) {
Expand Down
2 changes: 1 addition & 1 deletion ...saved_state/compareGeneratedSqlWithExpectedSqlForMinimalChangesets/renameColumn/mssql.sql
View file
Open in desktop
Expand Up @@ -2,4 +2,4 @@
-- Change Parameter: newColumnName=full_name
-- Change Parameter: oldColumnName=name
-- Change Parameter: tableName=person
exec sp_rename 'person.name', 'full_name';
exec sp_rename 'person.name', 'full_name', 'COLUMN';
2 changes: 1 addition & 1 deletion ...e-integration-tests/src/test/java/liquibase/statementexecute/RenameColumnExecuteTest.java
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ public void noSchema() throws Exception {
assertCorrect("alter table table_name alter column column_name rename to new_name", H2Database.class, HsqlDatabase.class);
assertCorrect("alter table table_name alter column column_name to new_name", FirebirdDatabase.class);
assertCorrect("alter table table_name change column_name new_name int", MySQLDatabase.class, MariaDBDatabase.class);
assertCorrect("exec sp_rename '[table_name].[column_name]', 'new_name'", MSSQLDatabase.class);
assertCorrect("exec sp_rename '[table_name].[column_name]', 'new_name', 'COLUMN'", MSSQLDatabase.class);
assertCorrect("exec sp_rename 'table_name.column_name', 'new_name'", SybaseDatabase.class);
assertCorrect("alter table [table_name] rename column_name to new_name",SybaseASADatabase.class);
assertCorrectOnRest("alter table [table_name] rename column [column_name] to [new_name]");
Expand Down