fix(binaries): add engine version to db_gen for unpack (#652)

binaries/binaries.go

@@ -68,15 +68,15 @@ var baseDirName = path.Join("prisma", "binaries")
 
 // GlobalTempDir returns the path of where the engines live
 // internally, this is the global temp dir
-func GlobalTempDir() string {
+func GlobalTempDir(version string) string {
 	temp := os.TempDir()
 	logger.Debug.Printf("temp dir: %s", temp)
 
-	return path.Join(temp, baseDirName, "engines", EngineVersion)
+	return path.Join(temp, baseDirName, "engines", version)
 }
 
-func GlobalUnpackDir() string {
-	return path.Join(GlobalTempDir(), "unpacked")
+func GlobalUnpackDir(version string) string {
+	return path.Join(GlobalTempDir(version), "unpacked", "v2")
 }
 
 // GlobalCacheDir returns the path of where the CLI lives

binaries/bindata/bindata.go

@@ -6,6 +6,8 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
+
+	"github.com/prisma/prisma-client-go/binaries"
 )
 
 // TODO go fmt files after creation
@@ -59,9 +61,9 @@ import (
 )
 
 func init() {
-	unpack.Unpack(data, "%s")
+	unpack.Unpack(data, "%s", "%s")
 }
-`, name, constraints, pkg, name)
+`, name, constraints, pkg, name, binaries.EngineVersion)
 	return err
 }
 

binaries/unpack/unpack.go

@@ -15,15 +15,15 @@ import (
 // TODO check checksum after expanding file
 
 // noinspection GoUnusedExportedFunction
-func Unpack(data []byte, name string) {
+func Unpack(data []byte, name string, version string) {
 	start := time.Now()
 
 	file := fmt.Sprintf("prisma-query-engine-%s", name)
 
 	// TODO check if dev env/dev binary in ~/.prisma
 	// TODO check if engine in local dir OR env var
 
-	tempDir := binaries.GlobalUnpackDir()
+	tempDir := binaries.GlobalUnpackDir(version)
 
 	dir := platform.CheckForExtension(platform.Name(), path.Join(tempDir, file))
 

engine/lifecycle.go

@@ -69,7 +69,7 @@ func (e *QueryEngine) Disconnect() error {
 func (e *QueryEngine) ensure() (string, error) {
 	ensureEngine := time.Now()
 
-	binariesPath := binaries.GlobalUnpackDir()
+	binariesPath := binaries.GlobalUnpackDir(binaries.EngineVersion)
 	// check for darwin/windows/linux first
 	binaryName := platform.CheckForExtension(platform.Name(), platform.Name())
 	exactBinaryName := platform.CheckForExtension(platform.Name(), platform.BinaryPlatformName())