fix db create when spock already on the cluster (multiple db's)

pgEdge · Feb 9, 2024 · 4b0362f · 4b0362f
1 parent 0744bce
commit 4b0362f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 
 ## planned for 24.2.1 on 2024-02-12 ###########
+  - fix db create when spock already on the cluster (multiple db's)
   - fix bug installing specific component versions where metadata updates & config not run
   - bump postgrest from 11.2.0 to 12.0.2 (& also remove dependency on deprecated component.py)
   - bump backrest from 2.49 to 2.50

diff --git a/cli/scripts/db.py b/cli/scripts/db.py
@@ -66,13 +66,14 @@ def create(db=None, User=None, Passwd=None, pg=None, spock="latest"):
        major_ver = f"{spock[:1]}{spock[2:3:1]}"
        ver = spock
 
-    spock_comp = f"spock{major_ver}-pg{pg} {ver}"
-
+    spock_comp = f"spock{major_ver}-pg{pg}"
     st8 = util.get_comp_state(spock_comp)
+
     if st8 in ("Installed", "Enabled"):
         cmd = "CREATE EXTENSION spock"
         rc3 = util.echo_cmd(ncb + '"psql -q -c \\"' + cmd + '\\" ' + str(db) + '"')
     else:
+        spock_comp = f"spock{major_ver}-pg{pg} {ver}"
         rc3 = util.echo_cmd(nc + "install " + spock_comp + " -d " + str(db))
 
     cmd = "CREATE EXTENSION snowflake"