9d1b7c4 · reshape · git.iko.soy

git.iko.soy/reshape

Use helper function to find column in table

commit9d1b7c40825d23a3678d6b9182519b1bde8d8c4d authorfabianlindfors <fabian@flapplabs.se> dateFri 21 Jan 2022, 17:14 (5 years ago) parentb6f1a0c

3 files changed+2−6

unifiedsplit

src/migrations/add_column.rs−2

@@ -87,8 +87,6 @@ impl Action for AddColumn {

8787 db.run(&query).context("failed to add column")?;

8888

8989 if let Some(up) = &self.up {

90− let table = schema.get_table(db, &self.table)?;

91−

9290 let declarations: Vec<String> = table

9391 .columns

9492 .iter()

src/migrations/alter_column.rs+1−3

@@ -48,9 +48,7 @@ impl Action for AlterColumn {

4848 let table = schema.get_table(db, &self.table)?;

4949

5050 let column = table

51− .columns

52− .iter()

53− .find(|column| column.name == self.column)

51+ .get_column(&self.column)

5452 .ok_or_else(|| anyhow!("no such column {} exists", self.column))?;

5553

5654 let temporary_column_name = self.temporary_column_name(ctx);

src/schema.rs+1−1

@@ -302,7 +302,7 @@ impl Table {

302302 })

303303 }

304304

305− fn get_column(&self, name: &str) -> Option<&Column> {

305+ pub fn get_column(&self, name: &str) -> Option<&Column> {

306306 self.columns.iter().find(|column| column.name == name)

307307 }

308308}