Skip to content

Draft: Strict versioning #1

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Draft: Strict versioning #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
98bc6ac
Separate migration and queries; rename tables per version
Jan 17, 2023
891f65b
Build/run split, wip schema change error detection
Jan 18, 2023
f403c38
Migration detection working; concurrent migrations working
Jan 18, 2023
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
37 changes: 27 additions & 10 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,33 @@ repository = "https://github.com/andrewbaxter/good-ormning"
readme = "readme.md"

[dependencies]
chrono = "0.4.23"
enum_dispatch = "0.3.9"
genemichaels = "0.1.15"
hex = "0.4.3"
proc-macro2 = "1.0.49"
quote = "1.0.23"
rpds = "0.12.0"
samevariant = "0.0.1"
stable-hash = "0.4.3"
syn = "1.0.107"
chrono = { version = "0.4.23", optional = true }
enum_dispatch = { version = "0.3.9", optional = true }
genemichaels = { version = "0.1.15", optional = true }
hex = { version = "0.4.3", optional = true }
proc-macro2 = { version = "1.0.49", optional = true }
quote = { version = "1.0.23", optional = true }
rpds = { version = "0.12.0", optional = true }
rusqlite = { version = "0.28.0", optional = true }
samevariant = { version = "0.0.1", optional = true }
syn = { version = "1.0.107", optional = true }
tokio-postgres = { version = "0.7.7", optional = true }

[features]
build = [
"dep:chrono",
"dep:enum_dispatch",
"dep:genemichaels",
"dep:hex",
"dep:proc-macro2",
"dep:quote",
"dep:rpds",
"dep:samevariant",
"dep:syn",
]
run = []
sqlite = ["dep:rusqlite", "run"]
pg = ["dep:tokio-postgres", "run"]

[workspace]
members = ["integration_tests"]
3 changes: 2 additions & 1 deletion integration_tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ chrono = "0.4.23"
rusqlite = "0.28.0"
testcontainers = { version = "0.14.0", features = ["tokio"] }
tokio = { version = "1.24.1", features = ["macros", "rt"] }
"good-ormning" = { path = "..", features = ["sqlite", "pg"] }

[build-dependencies]
"good-ormning" = { path = ".." }
"good-ormning" = { path = "..", features = ["build"] }

[dev-dependencies]
anyhow = "1.0.68"
Expand Down
128 changes: 86 additions & 42 deletions integration_tests/build_pg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use std::path::Path;
use good_ormning::pg::{
use good_ormning::buildtime::pg::{
Version,
schema::field::{
field_str,
Expand Down Expand Up @@ -37,7 +37,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zEOIWAACJ");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_base_insert.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_base_insert.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "text".into(),
Expand All @@ -52,7 +52,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zJCPRHK37");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_i32().build());
generate(&root.join("tests/pg_gen_param_i32.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_param_i32.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "val".into(),
Expand All @@ -67,7 +67,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zJCPRHK37");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_utctime().build());
generate(&root.join("tests/pg_gen_param_utctime.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_param_utctime.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "val".into(),
Expand All @@ -82,7 +82,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("z8JI0I1E4");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_i32().opt().build());
generate(&root.join("tests/pg_gen_param_opt_i32.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_param_opt_i32.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "val".into(),
Expand All @@ -97,7 +97,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zT7F4746C");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_i32().opt().build());
generate(&root.join("tests/pg_gen_param_opt_i32_null.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_param_opt_i32_null.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand All @@ -113,7 +113,7 @@ pub fn build(root: &Path) {
let bananna = v.table("zH2Q9TOLG");
let hizat =
bananna.field(&mut v, "z437INV6D", "hizat", field_str().custom("integration_tests::MyString").build());
generate(&root.join("tests/pg_gen_param_custom.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_param_custom.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "val".into(),
Expand All @@ -134,7 +134,7 @@ pub fn build(root: &Path) {
"hizat",
field_str().custom("integration_tests::MyString").opt().build(),
);
generate(&root.join("tests/pg_gen_param_opt_custom.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_param_opt_custom.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "text".into(),
Expand All @@ -152,8 +152,8 @@ pub fn build(root: &Path) {
bananna.index("zPRVXKY6D", &[&hizat]).unique().build(&mut v);
generate(
&root.join("tests/pg_gen_insert_on_conflict_do_nothing.rs"),
vec![(0usize, v)],
vec![
&vec![(0, v)],
&vec![
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "text".into(),
type_: hizat.def.type_.type_.clone(),
Expand All @@ -174,8 +174,8 @@ pub fn build(root: &Path) {
bananna.index("zPRVXKY6D", &[&hizat]).unique().build(&mut v);
generate(
&root.join("tests/pg_gen_insert_on_conflict_update.rs"),
vec![(0usize, v)],
vec![new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
&vec![(0, v)],
&vec![new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "text".into(),
type_: hizat.def.type_.type_.clone(),
}), (two.id.clone(), Expr::Param {
Expand Down Expand Up @@ -206,7 +206,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zSPEZNHA8");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_update.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_update.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand All @@ -225,7 +225,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zSPEZNHA8");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_update_where.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_update_where.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand All @@ -251,7 +251,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zSPEZNHA8");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_update_returning.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_update_returning.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand All @@ -268,7 +268,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zLBDEHGRB");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_delete.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_delete.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand All @@ -284,7 +284,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zLBDEHGRB");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_delete_where.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_delete_where.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand All @@ -307,7 +307,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zLBDEHGRB");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_delete_returning.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_delete_returning.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(
&bananna,
Expand Down Expand Up @@ -355,7 +355,7 @@ pub fn build(root: &Path) {
],
).build_migration(),
);
generate(&root.join("tests/pg_gen_select_join.rs"), vec![(0usize, v)], vec![new_select(&bananna).join(Join {
generate(&root.join("tests/pg_gen_select_join.rs"), &vec![(0, v)], &vec![new_select(&bananna).join(Join {
source: Box::new(NamedSelectSource {
source: JoinSource::Table(one.0.clone()),
alias: None,
Expand All @@ -374,7 +374,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zEOIWAACJ");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_select_limit.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_select_limit.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "text".into(),
Expand All @@ -389,7 +389,7 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zEOIWAACJ");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_i32().build());
generate(&root.join("tests/pg_gen_select_order.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_select_order.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "v".into(),
Expand All @@ -408,7 +408,7 @@ pub fn build(root: &Path) {
let bananna = v.table("zEOIWAACJ");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_i32().build());
let hizat2 = bananna.field(&mut v, "z3CRAVV3M", "hizat2", field_i32().build());
generate(&root.join("tests/pg_gen_select_group_by.rs"), vec![(0usize, v)], vec![
generate(&root.join("tests/pg_gen_select_group_by.rs"), &vec![(0, v)], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "v".into(),
Expand All @@ -432,9 +432,9 @@ pub fn build(root: &Path) {
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
let zomzom =
bananna.field(&mut v, "zPREUVAOD", "zomzom", field_bool().migrate_fill(Expr::LitBool(true)).build());
generate(&root.join("tests/pg_gen_migrate_add_field.rs"), vec![
generate(&root.join("tests/pg_gen_migrate_add_field.rs"), &vec![
// Versions (previous)
(0usize, {
(0, {
let mut v = Version::default();
let bananna = v.table("zTWA93SX0");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
Expand All @@ -446,29 +446,73 @@ pub fn build(root: &Path) {
);
v
}),
(1usize, v)
], vec![
(1, v)
], &vec![
// Queries
new_select(&bananna).return_fields(&[&hizat, &zomzom]).build_query("get_banan", QueryResCount::MaybeOne)
]).unwrap();
}

// # Migrate - detect
{
let mut v0 = Version::default();
let bananna_v0 = v0.table("zTWA93SX0");
let hizat_v0 = bananna_v0.field(&mut v0, "z437INV6D", "hizat", field_str().build());
let mut versions = vec![
// Versions (previous)
(0, {
let mut v = Version::default();
let bananna = v.table("zTWA93SX0");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
v.post_migration(
new_insert(
&bananna,
vec![(hizat.id.clone(), Expr::LitString("nizoot".into()))],
).build_migration(),
);
v
})
];
generate(
&root.join("tests/pg_gen_migrate_detect_1.rs"),
&versions,
&vec![
new_select(&bananna_v0)
.return_fields(&[&hizat_v0])
.build_query("get_banan", QueryResCount::MaybeOne)
],
).unwrap();
let mut v1 = Version::default();
let bananna_v1 = v1.table("zTWA93SX0");
let hizat_v1 = bananna_v1.field(&mut v1, "z437INV6D", "hizat", field_str().build());
versions.push((1, v1));
generate(
&root.join("tests/pg_gen_migrate_detect_2.rs"),
&versions,
&vec![
new_select(&bananna_v1)
.return_fields(&[&hizat_v1])
.build_query("get_banan", QueryResCount::MaybeOne)
],
).unwrap();
}

// # Migrate - remove field
{
let mut v = Version::default();
let bananna = v.table("z1MD8L1CZ");
let hizat = bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_migrate_remove_field.rs"), vec![
generate(&root.join("tests/pg_gen_migrate_remove_field.rs"), &vec![
// Versions (previous)
(0usize, {
(0, {
let mut v = Version::default();
let bananna = v.table("z1MD8L1CZ");
bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
bananna.field(&mut v, "zPREUVAOD", "zomzom", field_bool().build());
v
}),
(1usize, v)
], vec![
(1, v)
], &vec![
// Queries
new_insert(&bananna, vec![(hizat.id.clone(), Expr::Param {
name: "okolor".into(),
Expand All @@ -484,16 +528,16 @@ pub fn build(root: &Path) {
bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
let two = v.table("zHXF3YVGQ");
let field_two = two.field(&mut v, "z156A4Q8W", "two", field_i32().build());
generate(&root.join("tests/pg_gen_migrate_add_table.rs"), vec![
generate(&root.join("tests/pg_gen_migrate_add_table.rs"), &vec![
// Versions (previous)
(0usize, {
(0, {
let mut v = Version::default();
let bananna = v.table("z4RGW742J");
bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
v
}),
(1usize, v)
], vec![
(1, v)
], &vec![
// Queries
new_insert(&two, vec![(field_two.id.clone(), Expr::Param {
name: "two".into(),
Expand All @@ -507,18 +551,18 @@ pub fn build(root: &Path) {
let mut v = Version::default();
let bananna = v.table("zX7CEK8JC");
bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_migrate_remove_table.rs"), vec![
generate(&root.join("tests/pg_gen_migrate_remove_table.rs"), &vec![
// Versions (previous)
(0usize, {
(0, {
let mut v = Version::default();
let bananna = v.table("zX7CEK8JC");
bananna.field(&mut v, "z437INV6D", "hizat", field_str().build());
let two = v.table("z45HT1YW2");
two.field(&mut v, "z156A4Q8W", "two", field_i32().build());
v
}),
(1usize, v)
], vec![]).unwrap();
(1, v)
], &vec![]).unwrap();
}

// # Migrate - remove index
Expand All @@ -540,10 +584,10 @@ pub fn build(root: &Path) {
v1.pre_migration(new_insert(&v0_two, vec![(v0_field_two.id.clone(), Expr::LitI32(7))]).build_migration());
let v1_bananna = v1.table("zMI5V9F2V");
v1_bananna.field(&mut v1, "z437INV6D", "hizat", field_str().build());
generate(&root.join("tests/pg_gen_migrate_pre_migration.rs"), vec![
generate(&root.join("tests/pg_gen_migrate_pre_migration.rs"), &vec![
// Versions (previous)
(0usize, v0),
(1usize, v1)
], vec![]).unwrap();
(0, v0),
(1, v1)
], &vec![]).unwrap();
}
}
Loading