Bump goflow and revert changes to flow loading SQL

Ilhasoft · Nov 6, 2019 · 438b908 · 438b908
1 parent f9addfa
commit 438b908
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.10.0 // indirect
 	github.com/nyaruka/ezconf v0.2.1
 	github.com/nyaruka/gocommon v1.1.1
-	github.com/nyaruka/goflow v0.56.0
+	github.com/nyaruka/goflow v0.56.1
 	github.com/nyaruka/librato v1.0.0
 	github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d
 	github.com/nyaruka/null v1.2.0

diff --git a/go.sum b/go.sum
@@ -70,8 +70,8 @@ github.com/nyaruka/ezconf v0.2.1 h1:TDXWoqjqYya1uhou1mAJZg7rgFYL98EB0Tb3+BWtUh0=
 github.com/nyaruka/ezconf v0.2.1/go.mod h1:ey182kYkw2MIi4XiWe1FR/mzI33WCmTWuceDYYxgnQw=
 github.com/nyaruka/gocommon v1.1.1 h1:RnQ+kMzN1lA+W0NpkBDd0mGU3UqadJygR3SMpITMYTQ=
 github.com/nyaruka/gocommon v1.1.1/go.mod h1:QbdU2J9WBsqBmeZRuwndf2f6O7rD7mkC0bGn5UNnwjI=
-github.com/nyaruka/goflow v0.56.0 h1:dwzJF5fVXCOkSjKsSKYYHKKL8QdVOAtlevYtVNv2WSU=
-github.com/nyaruka/goflow v0.56.0/go.mod h1:wI+5qZRajxxZvfYXqbmWauTWAJ0GOTTG3TZDkixU/E0=
+github.com/nyaruka/goflow v0.56.1 h1:MxOx2pQYdjqAy8WVqIm59apAARWXBvaeakLjOy//9O8=
+github.com/nyaruka/goflow v0.56.1/go.mod h1:wI+5qZRajxxZvfYXqbmWauTWAJ0GOTTG3TZDkixU/E0=
 github.com/nyaruka/librato v1.0.0 h1:Vznj9WCeC1yZXbBYyYp40KnbmXLbEkjKmHesV/v2SR0=
 github.com/nyaruka/librato v1.0.0/go.mod h1:pkRNLFhFurOz0QqBz6/DuTFhHHxAubWxs4Jx+J7yUgg=
 github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d h1:hyp9u36KIwbTCo2JAJ+TuJcJBc+UZzEig7RI/S5Dvkc=

diff --git a/models/flows.go b/models/flows.go
@@ -156,8 +156,9 @@ SELECT ROW_TO_JSON(r) FROM (SELECT
 	coalesce(metadata, '{}')::jsonb as config,
 	definition::jsonb || 
 		jsonb_build_object(
-			'uuid', f.uuid,
 			'name', f.name,
+			'uuid', f.uuid,
+			'flow_type', f.flow_type, 
 			'expire_after_minutes', f.expires_after_minutes,
 			'metadata', jsonb_build_object(
 				'uuid', f.uuid, 
@@ -202,8 +203,9 @@ SELECT ROW_TO_JSON(r) FROM (SELECT
 	coalesce(metadata, '{}')::jsonb as config,
 	definition::jsonb || 
 		jsonb_build_object(
-			'uuid', f.uuid,
 			'name', f.name,
+			'uuid', f.uuid,
+			'flow_type', f.flow_type, 
 			'expire_after_minutes', f.expires_after_minutes,
 			'metadata', jsonb_build_object(
 				'uuid', f.uuid,