@@ -244,7 +244,6 @@ impl SqlRenderer for PostgresRenderer {
244244 fn render_alter_table ( & self , alter_table : & AlterTable , schemas : MigrationPair < & SqlSchema > ) -> Vec < String > {
245245 let AlterTable { changes, table_ids } = alter_table;
246246 let mut lines = Vec :: new ( ) ;
247- let mut separate_statements = Vec :: new ( ) ;
248247 let mut before_statements = Vec :: new ( ) ;
249248 let mut after_statements = Vec :: new ( ) ;
250249 let tables = schemas. walk ( * table_ids) ;
@@ -255,7 +254,7 @@ impl SqlRenderer for PostgresRenderer {
255254 "DROP CONSTRAINT {}" ,
256255 Quoted :: postgres_ident( tables. previous. primary_key( ) . unwrap( ) . name( ) )
257256 ) ) ,
258- TableChange :: RenamePrimaryKey => separate_statements . push ( format ! (
257+ TableChange :: RenamePrimaryKey => after_statements . push ( format ! (
259258 "ALTER TABLE {} RENAME CONSTRAINT {} TO {}" ,
260259 quoted_alter_table_name( tables) ,
261260 Quoted :: postgres_ident( tables. previous. primary_key( ) . unwrap( ) . name( ) ) ,
@@ -319,12 +318,10 @@ impl SqlRenderer for PostgresRenderer {
319318 } ;
320319 }
321320
322- if lines. is_empty ( ) && separate_statements . is_empty ( ) {
323- return Vec :: new ( ) ;
321+ if lines. is_empty ( ) {
322+ return before_statements . into_iter ( ) . chain ( after_statements ) . collect ( ) ;
324323 }
325324
326- after_statements. extend ( separate_statements) ;
327-
328325 if self . is_cockroach {
329326 let mut out = Vec :: with_capacity ( before_statements. len ( ) + after_statements. len ( ) + lines. len ( ) ) ;
330327 out. extend ( before_statements) ;
@@ -334,10 +331,6 @@ impl SqlRenderer for PostgresRenderer {
334331 out. extend ( after_statements) ;
335332 out
336333 } else {
337- if lines. is_empty ( ) {
338- return before_statements. into_iter ( ) . chain ( after_statements) . collect ( ) ;
339- }
340-
341334 let alter_table = format ! ( "ALTER TABLE {} {}" , quoted_alter_table_name( tables) , lines. join( ",\n " ) ) ;
342335 before_statements
343336 . into_iter ( )
0 commit comments