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

Fix: Multiple Init script fixes and some other Postgres fixes #3950

Merged
merged 12 commits into from
Dec 18, 2024
Merged

Fix: Multiple Init script fixes and some other Postgres fixes #3950

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2dcfdca
fix init scripts for postgres
peaklabs-dev Oct 18, 2024
66b458d
aws filter still used
peaklabs-dev Oct 18, 2024
907c6cc
format
peaklabs-dev Oct 18, 2024
7f393eb
fix indexing after deletion and make sure init script is removed form…
peaklabs-dev Oct 18, 2024
1ec3caf
fix: if an init script is renamed the old version is still on the server
peaklabs-dev Oct 18, 2024
159c4aa
remove old init script on server if it is renamed
peaklabs-dev Oct 18, 2024
18201ec
fix remove postgres config if it is null or not set
peaklabs-dev Oct 18, 2024
7328724
Merge branch 'coollabsio:main' into fix-postgres-init-scripts
peaklabs-dev Dec 4, 2024
12a48a1
Merge branch 'next' into fix-postgres-init-scripts
peaklabs-dev Dec 9, 2024
f8a2d92
Merge branch 'next' into fix-postgres-init-scripts
peaklabs-dev Dec 16, 2024
07984ce
Merge branch 'next' into fix-postgres-init-scripts
andrasbacsai Dec 18, 2024
33ae10a
fix
andrasbacsai Dec 18, 2024
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
Prev Previous commit
Next Next commit
remove old init script on server if it is renamed
  • Loading branch information
@peaklabs-dev
peaklabs-dev committed Oct 18, 2024
commit 159c4aa7ac02fdae6849d8c6db7a7a837dd8f01a
18 changes: 17 additions & 1 deletion app/Livewire/Project/Database/Postgresql/General.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,29 @@ public function save_init_script($script)
$initScripts = collect($this->database->init_scripts ?? []);

$existingScript = $initScripts->firstWhere('filename', $script['filename']);
$oldScript = $initScripts->firstWhere('index', $script['index']);

if ($existingScript && $existingScript['index'] !== $script['index']) {
$this->dispatch('error', 'A script with this filename already exists.');

return;
}

$container_name = $this->database->uuid;
$configuration_dir = database_configuration_dir().'/'.$container_name;

if ($oldScript && $oldScript['filename'] !== $script['filename']) {
$old_file_path = "$configuration_dir/docker-entrypoint-initdb.d/{$oldScript['filename']}";
$delete_command = "rm -f $old_file_path";
try {
instant_remote_process([$delete_command], $this->server);
} catch (\Exception $e) {
$this->dispatch('error', 'Failed to remove old init script from server: '.$e->getMessage());

return;
}
}

$index = $initScripts->search(function ($item) use ($script) {
return $item['index'] === $script['index'];
});
Expand All @@ -153,7 +169,7 @@ public function save_init_script($script)
->all();

$this->database->save();
$this->dispatch('success', 'Init script saved.');
$this->dispatch('success', 'Init script saved and updated.');
}

public function delete_init_script($script)
Expand Down