Fixed

sql_runner/main.go

@@ -237,7 +237,7 @@ func resolveSqlRoot(sqlroot string, playbookPath string, consulAddress string, c
 				if err != nil {
 					return "", nil
 				}
-				return strings.Replace(sqlroot, SQLROOT_PLAYBOOK, absPlaybookPath, 1), nil
+				return strings.ReplaceAll(sqlroot, "PLAYBOOK", absPlaybookPath), nil
 			}
 
 			return sqlroot, nil
@@ -261,6 +261,15 @@ func resolveSqlRoot(sqlroot string, playbookPath string, consulAddress string, c
 		}
 		return "", consulErr2
 	default:
+		// For allowing relative paths from the playbook
+		if strings.HasPrefix(sqlroot, SQLROOT_PLAYBOOK) {
+			absPlaybookPath, err := filepath.Abs(filepath.Dir(playbookPath))
+			if err != nil {
+				return "", nil
+			}
+			return strings.ReplaceAll(sqlroot, "PLAYBOOK", absPlaybookPath), nil
+		}
+
 		return sqlroot, nil
 	}
 }

sql_runner/main_test.go

@@ -107,4 +107,9 @@ func TestResolveSqlRoot(t *testing.T) {
 	assert.NotNil(str)
 	assert.Nil(err)
 	assert.Equal("random", str)
+
+	str, err = resolveSqlRoot(SQLROOT_PLAYBOOK+"/../sql/", "../integration/resources/good-postgres.yml", "", true)
+	assert.NotNil(str)
+	assert.Nil(err)
+	assert.True(strings.HasSuffix(str, "/integration/resources/../sql/"))
 }