fix: issue with array connect

dosco · Apr 27, 2021 · de05470 · de05470
1 parent 6919574
commit de05470
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 3 deletions.
diff --git a/core/internal/psql/mutate.go b/core/internal/psql/mutate.go
@@ -125,7 +125,7 @@ func (c *compilerContext) renderNestedRelColumns(m qcode.Mutate, values bool, pr
 		}
 		if values {
 			if col.Col.Array {
-				c.w.WriteString(`ARRAY(SELECT `)
+				c.w.WriteString(`(SELECT `)
 				c.quoted(col.VCol.Name)
 				c.w.WriteString(` FROM `)
 				c.quoted(col.VCol.Table)

diff --git a/internal/cmd/cmd_migrate.go b/internal/cmd/cmd_migrate.go
@@ -51,8 +51,10 @@ func cmdDBMigrate() func(*cobra.Command, []string) {
 			log.Fatalf("No migrations found")
 		}
 
-		m.OnStart = func(sequence int32, name, direction, sql string) {
-			log.Infof("Executing migration: %s, %s\n%s", name, direction, sql)
+		if conf.Debug {
+			m.OnStart = func(sequence int32, name, direction, sql string) {
+				log.Infof("Executing migration: %s, %s\n%s", name, direction, sql)
+			}
 		}
 
 		currentVersion, err := m.GetCurrentVersion()

diff --git a/serv/db.go b/serv/db.go
@@ -87,6 +87,7 @@ func initPostgres(c *Config, useDB, useTelemetry bool) (*dbConf, error) {
 	config.Port = c.DB.Port
 	config.User = c.DB.User
 	config.Password = c.DB.Password
+
 	config.RuntimeParams = map[string]string{
 		"application_name": c.AppName,
 		"search_path":      c.DB.Schema,

diff --git a/serv/http.go b/serv/http.go
@@ -185,6 +185,10 @@ func (s *Service) reqLog(res *core.Result, err error) {
 		fields = append(fields, zap.String("sql", res.SQL()))
 	}
 
+	if s.conf.Debug {
+		s.log.Info(res.SQL())
+	}
+
 	if err != nil {
 		fields = append(fields, zap.Error(err))
 		s.zlog.Error("Query Failed", fields...)