main..4c316ae · reshape

git.iko.soy/reshape

8 files changed+22−68

unifiedsplit

.github/workflows/lint.yaml+3−3 .github/workflows/publish-crate.yaml−20 .github/workflows/publish-docker.yaml−25 Cargo.toml+3−3 Dockerfile+1−1 README.md+11−12 src/migrations/add_column.rs+3−3 tests/complex.rs+1−1

.github/workflows/lint.yaml+3−3

@@ -15,7 +15,7 @@ jobs:

1515 runs-on: ubuntu-latest

1616 steps:

1717 - name: Checkout

18− uses: actions/checkout@v4

18+ uses: actions/checkout@v2

1919 - name: Select Rust toolchain with Clippy

2020 uses: actions-rs/toolchain@v1

2121 with:

@@ -23,6 +23,6 @@ jobs:

2323 components: clippy

2424 override: true

2525 - name: Use cache for Rust dependencies

26− uses: Swatinem/rust-cache@v2

26+ uses: Swatinem/rust-cache@v1

2727 - name: Lint using Clippy

28− run: cargo clippy

28+ run: cargo clippy

.github/workflows/publish-crate.yamldeleted−20

@@ -1,20 +0,0 @@

1−name: Publish crate

2−

3−on: workflow_dispatch

4−

5−jobs:

6− publish-crate:

7− runs-on: ubuntu-latest

8− steps:

9− - name: Checkout

10− uses: actions/checkout@v2

11− - name: Select Rust toolchain

12− uses: actions-rs/toolchain@v1

13− with:

14− toolchain: stable

15− - name: Publish to crates.io

16− uses: actions-rs/cargo@v1

17− with:

18− command: publish

19− env:

20− CARGO_REGISTRY_TOKEN: ${{ secrets.CRATES_IO_TOKEN }}

.github/workflows/publish-docker.yamldeleted−25

@@ -1,25 +0,0 @@

1−name: Publish Docker image

2−

3−on:

4− workflow_dispatch:

5− inputs:

6− version:

7− description: "Version (without 'v' prefix)"

8− required: true

9− type: string

10−

11−jobs:

12− publish-docker:

13− runs-on: ubuntu-latest

14− steps:

15− - name: Checkout

16− uses: actions/checkout@v2

17− - name: Log in to Docker

18− env:

19− DOCKER_PASSWORD: ${{ secrets.DOCKER_ACCESS_TOKEN }}

20− run: |

21− docker login -u ${{ secrets.DOCKER_USER }} -p $DOCKER_PASSWORD

22− - name: Build Docker image

23− run: docker build . --tag ${{ secrets.DOCKER_USER }}/reshape:${{ inputs.version }} --tag ${{ secrets.DOCKER_USER }}/reshape:latest

24− - name: Push Docker image

25− run: docker push --all-tags ${{ secrets.DOCKER_USER }}/reshape

Cargo.toml+3−3

@@ -1,6 +1,6 @@

11[package]

22name = "reshape"

3−version = "0.7.0"

3+version = "0.6.1"

44description = "An easy-to-use, zero-downtime schema migration tool for Postgres"

55homepage = "https://github.com/fabianlindfors/reshape"

66documentation = "https://github.com/fabianlindfors/reshape"

@@ -9,7 +9,7 @@ license = "MIT"

99keywords = ["postgres", "migrations"]

1010edition = "2021"

1111authors = ["Fabian Lindfors"]

12−rust-version = "1.70"

12+rust-version = "1.58"

1313

1414[dependencies]

1515postgres = { version = "0.19.2", features = ["with-serde_json-1"] }

@@ -23,4 +23,4 @@ version = "3.0.0"

2323colored = "2"

2424rand = "0.8"

2525dotenv = "0.15.0"

26−lexical-sort = "0.3.1"

26+lexical-sort = "0.3.1"

Dockerfile+1−1

@@ -1,4 +1,4 @@

1−FROM rust:1.70.0 AS builder

1+FROM rust:1.58.0 AS builder

22WORKDIR /usr/src/reshape

33COPY . .

44RUN cargo build --release

README.md+11−12

@@ -627,6 +627,17 @@ The `up` and `down` options available when creating tables, adding columns and r

627627_Example: move `email` column from `users` to `profiles` table_

628628

629629```toml

630+[[actions]]

631+type = "remove_column"

632+table = "users"

633+column = "email"

634+

635+ # When `profiles` is changed in the new schema, we write the email address back to the removed column

636+ [actions.down]

637+ table = "profiles"

638+ value = "profiles.email"

639+ where = "users.id = profiles.user_id"

640+

630641[[actions]]

631642type = "add_column"

632643table = "profiles"

@@ -641,17 +652,6 @@ table = "profiles"

641652 table = "users"

642653 value = "users.email"

643654 where = "profiles.user_id = users.id"

644−

645−[[actions]]

646−type = "remove_column"

647−table = "users"

648−column = "email"

649−

650− # When `profiles` is changed in the new schema, we write the email address back to the removed column

651− [actions.down]

652− table = "profiles"

653− value = "profiles.email"

654− where = "users.id = profiles.user_id"

655655```

656656

657657_Example: turn a 1:N relationship between `users` and `accounts` into N:M and change the format of the associated `role`_

@@ -675,7 +675,6 @@ primary_key = ["account_id", "user_id"]

675675 [[actions.columns]]

676676 name = "role"

677677 type = "TEXT"

678− nullable = false

679678

680679 # Backfill the new table from `users` and uppercase the `role`

681680 [actions.up]

src/migrations/add_column.rs+3−3

@@ -81,7 +81,7 @@ impl Action for AddColumn {

8181 let temp_column_name = self.temp_column_name(ctx);

8282

8383 let mut definition_parts = vec![

84− format!("\"{}\"", temp_column_name.to_string()),

84+ temp_column_name.to_string(),

8585 self.column.data_type.to_string(),

8686 ];

8787

@@ -111,7 +111,7 @@ impl Action for AddColumn {

111111 .iter()

112112 .map(|column| {

113113 format!(

114− "\"{alias}\" public.{table}.{real_name}%TYPE := NEW.{real_name};",

114+ "{alias} public.{table}.{real_name}%TYPE := NEW.{real_name};",

115115 table = table.real_name,

116116 alias = column.name,

117117 real_name = column.real_name,

@@ -131,7 +131,7 @@ impl Action for AddColumn {

131131 DECLARE

132132 {declarations}

133133 BEGIN

134− NEW."{temp_column_name}" = {up};

134+ NEW.{temp_column_name} = {up};

135135 END;

136136 END IF;

137137 RETURN NEW;

tests/complex.rs+1−1

@@ -52,7 +52,7 @@ fn move_column_between_tables() {

5252 nullable = false

5353

5454 # When `users` is updated in the old schema, we write the email value to `profiles`

55− # When `profiles` is updated in the old schema, the equivalent `users.email` will also be updated

55+ # When `profiles` is updated in the old schema, we touch the equivalent `users` row to update it

5656 [actions.up]

5757 table = "users"

5858 value = "users.email"