don't drop db everytime

Author: fimac

languages/go/goeql

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 psql -U $POSTGRES_USER -d postgres -f /app/scripts/db/create-db.sql
-psql -U $POSTGRES_USER -d gotest -a -f /app/scripts/db/cipherstash-encrypt.sql
+psql -U $POSTGRES_USER -d gotest -a -f /app/scripts/db/cipherstash-encrypt.sql

languages/go/xorm/init-db/init.sh

@@ -123,44 +123,6 @@ func (eb *EncryptedBoolField) FromDB(data []byte) error {
 	return nil
 }
 
-func setupDb() {
-	connStr := "user=postgres password=postgres port=5432 host=localhost dbname=postgres sslmode=disable"
-	engine, err := xorm.NewEngine("pgx", connStr)
-
-	if err != nil {
-		log.Fatalf("Could not connect to the database: %v", err)
-	}
-
-	var exists bool
-	_, err = engine.SQL("SELECT EXISTS (SELECT datname FROM pg_catalog.pg_database WHERE datname = 'gotest')").Get(&exists)
-	if err != nil {
-		log.Fatalf("Error: %v", err)
-	}
-
-	if exists {
-		_, err = engine.Exec("DROP DATABASE gotest WITH (FORCE);")
-		if err != nil {
-			log.Fatalf("Could not drop database: %v", err)
-		}
-		fmt.Println("Database 'gotest' dropped successfully!")
-
-		_, err = engine.Exec("CREATE DATABASE gotest;")
-		if err != nil {
-			log.Fatalf("Could not create database: %v", err)
-		}
-		fmt.Println("Database 'gotest' recreated!")
-	} else {
-		fmt.Println("Database 'gotest' doesn't exist. Creating...")
-		_, err = engine.Exec("CREATE DATABASE gotest;")
-		if err != nil {
-			log.Fatalf("Could not create database: %v", err)
-		}
-		fmt.Println("Database 'gotest' created successfully!")
-	}
-
-	engine.Close()
-}
-
 func createTable() {
 	connStr := "user=postgres password=postgres port=5432 host=localhost dbname=gotest sslmode=disable"
 	engine, err := xorm.NewEngine("pgx", connStr)
@@ -182,7 +144,7 @@ func createTable() {
 	engine.Close()
 }
 
-func installEql() {
+func addIndexesConstraints() {
 	connStr := "user=postgres password=postgres port=5432 host=localhost dbname=gotest sslmode=disable"
 	// Install Eql, custom types, indexes and constraints
 	// To install our custom types we need to use the database/sql package due to an issue
@@ -192,7 +154,7 @@ func installEql() {
 	if err != nil {
 		log.Fatalf("Could not connect to the database: %v", err)
 	}
-	InstallEql(engine)
+
 	AddIndexes(engine)
 	AddConstraint(engine)
 
@@ -219,12 +181,9 @@ func main() {
 }
 
 func setupDev() {
-	// Recreate gotest db on each run
-	setupDb()
-
 	// Connect to go test directly and create table
 	createTable()
 
-	// Install EQL and add config
-	installEql()
+	// Add config
+	addIndexesConstraints()
 }

languages/go/xorm/main.go

@@ -3,29 +3,8 @@ package main
 import (
 	"database/sql"
 	"log"
-	"os"
 )
 
-func InstallEql(engine *sql.DB) {
-	log.Println("Start installing custom types and function")
-	installDsl(engine)
-
-}
-
-// Installing EQL
-func installDsl(engine *sql.DB) {
-	path := "../../../release/cipherstash-encrypt-dsl.sql"
-	sql, err := os.ReadFile(path)
-	if err != nil {
-		log.Fatalf("Failed to read SQL file: %v", err)
-	}
-
-	_, err = engine.Exec(string(sql))
-	if err != nil {
-		log.Fatalf("Failed to execute SQL query: %v", err)
-	}
-}
-
 // We need to add constraints on any column that is encrypted.
 // This checks that all the required json fields are present, and that the data has been encrypted
 // by the proxy before inserting.

languages/go/xorm/migrations.go

@@ -15,9 +15,9 @@ if [ "${BASH_SOURCE[0]}" != "./run.sh" ]; then
 fi
 
 subproject_setup() {
-  # start postgres and proxy
+  # start postgres and proxy (create db and install eql)
   docker compose up -d
-  # setup table, install eql, constraints and indexes
+  # constraints and indexes
   go run . setupDev
 }
 
@@ -26,19 +26,7 @@ subproject_teardown() {
   docker compose down
 }
 
-subproject_examples() {
-  # reset db
-  go run . setupDev
-
-  # run examples queries
-  go run . runExamples
-}
-
 subproject_tests(){
-   # start postgres and proxy
-  docker compose up -d
-  # reset db
-  go run . setupDev
   #  run e2e tests
   make gotest
 }
@@ -53,10 +41,6 @@ case $subcommand in
     subproject_teardown
     ;;
 
-  examples)
-    subproject_examples
-    ;;
-
   tests)
     subproject_tests
     ;;