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

Add references when adding/changing pg columns #239

Merged
merged 1 commit into from
Apr 5, 2024
Merged

Add references when adding/changing pg columns #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 17 additions & 10 deletions butane_core/src/db/pg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ fn create_table_constraints(table: &ATable) -> String {
.columns
.iter()
.filter(|column| column.reference().is_some())
.map(|column| define_constraint(table, column))
.map(|column| define_constraint(&table.name, column))
.collect::<Vec<String>>()
.join("\n")
}
Expand All @@ -602,7 +602,7 @@ fn define_column(col: &AColumn) -> Result<String> {
))
}

fn define_constraint(table: &ATable, column: &AColumn) -> String {
fn define_constraint(table_name: &str, column: &AColumn) -> String {
let reference = column
.reference()
.as_ref()
Expand All @@ -611,7 +611,7 @@ fn define_constraint(table: &ATable, column: &AColumn) -> String {
ARef::Literal(literal) => {
format!(
"ALTER TABLE {} ADD FOREIGN KEY ({}) REFERENCES {}({});",
helper::quote_reserved_word(&table.name),
helper::quote_reserved_word(table_name),
helper::quote_reserved_word(column.name()),
helper::quote_reserved_word(literal.table_name()),
helper::quote_reserved_word(literal.column_name()),
Expand Down Expand Up @@ -658,12 +658,17 @@ fn drop_table(name: &str) -> String {

fn add_column(tbl_name: &str, col: &AColumn) -> Result<String> {
let default: SqlVal = helper::column_default(col)?;
Ok(format!(
let mut stmts = vec![format!(
"ALTER TABLE {} ADD COLUMN {} DEFAULT {};",
helper::quote_reserved_word(tbl_name),
define_column(col)?,
helper::sql_literal_value(default)?
))
)];
if col.reference().is_some() {
stmts.push(define_constraint(tbl_name, col));
}
let result = stmts.join("\n");
Ok(result)
}

fn remove_column(tbl_name: &str, name: &str) -> String {
Expand Down Expand Up @@ -715,16 +720,18 @@ fn change_column(
Some(col) => new_table.replace_column(col.clone()),
None => new_table.remove_column(old.name()),
}
let stmts: [&str; 4] = [
&create_table(&new_table, false)?,
&copy_table(old_table, &new_table),
&drop_table(&old_table.name),
&format!(
let mut stmts: Vec<String> = vec![
create_table(&new_table, false)?,
create_table_constraints(&new_table),
copy_table(old_table, &new_table),
drop_table(&old_table.name),
format!(
"ALTER TABLE {} RENAME TO {};",
helper::quote_reserved_word(&new_table.name),
helper::quote_reserved_word(tbl_name)
),
];
stmts.retain(|stmt| !stmt.is_empty());
let result = stmts.join("\n");
new_table.name.clone_from(&old_table.name);
current.replace_table(new_table);
Expand Down
1 change: 1 addition & 0 deletions examples/getting_started/.butane/migrations/20240115_023841384_dbconstraints/pg_down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ CREATE TABLE Post_tags_Many__butane_tmp (
owner INTEGER NOT NULL,
has TEXT NOT NULL
);
ALTER TABLE Post_tags_Many__butane_tmp ADD FOREIGN KEY (owner) REFERENCES Post(id);
INSERT INTO Post_tags_Many__butane_tmp SELECT owner, has FROM Post_tags_Many;
DROP TABLE Post_tags_Many;
ALTER TABLE Post_tags_Many__butane_tmp RENAME TO Post_tags_Many;
Expand Down
10 changes: 10 additions & 0 deletions examples/getting_started/.butane/migrations/20240115_023841384_dbconstraints/pg_up.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
Expand All @@ -33,6 +34,7 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
Expand All @@ -45,6 +47,7 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
Expand All @@ -57,6 +60,7 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
Expand All @@ -69,6 +73,7 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
Expand All @@ -81,6 +86,7 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
Expand All @@ -93,20 +99,24 @@ blog BIGINT NOT NULL,
byline TEXT ,
likes INTEGER NOT NULL
);
ALTER TABLE Post__butane_tmp ADD FOREIGN KEY (blog) REFERENCES Blog(id);
INSERT INTO Post__butane_tmp SELECT id, title, body, published, blog, byline, likes FROM Post;
DROP TABLE Post;
ALTER TABLE Post__butane_tmp RENAME TO Post;
CREATE TABLE Post_tags_Many__butane_tmp (
owner INTEGER NOT NULL,
has TEXT NOT NULL
);
ALTER TABLE Post_tags_Many__butane_tmp ADD FOREIGN KEY (has) REFERENCES Tag(tag);
INSERT INTO Post_tags_Many__butane_tmp SELECT owner, has FROM Post_tags_Many;
DROP TABLE Post_tags_Many;
ALTER TABLE Post_tags_Many__butane_tmp RENAME TO Post_tags_Many;
CREATE TABLE Post_tags_Many__butane_tmp (
owner INTEGER NOT NULL,
has TEXT NOT NULL
);
ALTER TABLE Post_tags_Many__butane_tmp ADD FOREIGN KEY (owner) REFERENCES Post(id);
ALTER TABLE Post_tags_Many__butane_tmp ADD FOREIGN KEY (has) REFERENCES Tag(tag);
INSERT INTO Post_tags_Many__butane_tmp SELECT owner, has FROM Post_tags_Many;
DROP TABLE Post_tags_Many;
ALTER TABLE Post_tags_Many__butane_tmp RENAME TO Post_tags_Many;
Expand Down
Loading