Skip to content

fix: support non timestamp but numeric migrations #301

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

Merged
merged 2 commits into from
Apr 4, 2025
Merged

fix: support non timestamp but numeric migrations #301

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c94d964
fix: support non timestamp but numeric migrations
psteinroe Apr 4, 2025
9872ce1
rename to sequence_number
psteinroe Apr 4, 2025
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
43 changes: 30 additions & 13 deletions crates/pgt_workspace/src/workspace/server/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,7 @@ pub(crate) fn get_migration(path: &Path, migrations_dir: &Path) -> Option<Migrat
let root_migration = path
.file_name()
.and_then(|os_str| os_str.to_str())
.and_then(|file_name| {
let mut parts = file_name.splitn(2, '_');
let timestamp = parts.next()?.parse().ok()?;
let name = parts.next()?.to_string();
Some(Migration { timestamp, name })
});
.and_then(parse_migration_name);

if root_migration.is_some() {
return root_migration;
Expand All @@ -49,12 +44,19 @@ pub(crate) fn get_migration(path: &Path, migrations_dir: &Path) -> Option<Migrat
path.parent()
.and_then(|parent| parent.file_name())
.and_then(|os_str| os_str.to_str())
.and_then(|dir_name| {
let mut parts = dir_name.splitn(2, '_');
let timestamp = parts.next()?.parse().ok()?;
let name = parts.next()?.to_string();
Some(Migration { timestamp, name })
})
.and_then(parse_migration_name)
}

fn parse_migration_name(name: &str) -> Option<Migration> {
let mut parts = name.splitn(2, '_');
// remove leading zeros to support numeric
let timestamp: u64 = parts.next()?.trim_start_matches('0').parse().ok()?;
let full_name = parts.next()?;
let name = full_name
.strip_suffix(".sql")
.unwrap_or(full_name)
.to_string();
Some(Migration { timestamp, name })
}

#[cfg(test)]
Expand All @@ -80,7 +82,7 @@ mod tests {
assert!(migration.is_some());
let migration = migration.unwrap();
assert_eq!(migration.timestamp, 1234567890);
assert_eq!(migration.name, "create_users.sql");
assert_eq!(migration.name, "create_users");
}

#[test]
Expand All @@ -100,6 +102,21 @@ mod tests {
assert_eq!(migration.name, "create_users");
}

#[test]
fn test_get_migration_prefix_number() {
let temp_dir = setup();
let migrations_dir = temp_dir.path().to_path_buf();
let path = migrations_dir.join("000201_a_migration.sql");
fs::write(&path, "").unwrap();

let migration = get_migration(&path, &migrations_dir);

assert!(migration.is_some());
let migration = migration.unwrap();
assert_eq!(migration.timestamp, 201);
assert_eq!(migration.name, "a_migration");
}

#[test]
fn test_get_migration_not_timestamp_in_filename() {
let migrations_dir = PathBuf::from("/tmp/migrations");
Expand Down