Merge pull request #259 from nyaruka/type_names

XType names
nyaruka · Apr 18, 2018 · fe13c11 · fe13c11
2 parents 8af7352 + 032fdc0
commit fe13c11
Show file tree

Hide file tree

Showing 63 changed files with 1,332 additions and 1,332 deletions.
diff --git a/cmd/exptester/main.go b/cmd/exptester/main.go
@@ -14,7 +14,7 @@ func main() {
 	vars := types.NewXMap(map[string]types.XValue{
 		"int1":    types.NewXNumberFromInt(1),
 		"int2":    types.NewXNumberFromInt(2),
-		"string1": types.NewXString("string1"),
+		"string1": types.NewXText("string1"),
 	})
 
 	if len(os.Args) != 2 {

diff --git a/cmd/flowrunner/testdata/flows/dynamic_groups.json b/cmd/flowrunner/testdata/flows/dynamic_groups.json
@@ -80,7 +80,7 @@
             {
                 "key": "age",
                 "label": "Age",
-                "value_type": "decimal"
+                "value_type": "number"
             },
             {
                 "key": "state",

diff --git a/cmd/flowrunner/testdata/flows/dynamic_groups_test.json b/cmd/flowrunner/testdata/flows/dynamic_groups_test.json
@@ -81,7 +81,7 @@
                 "contact": {
                     "fields": {
                         "age": {
-                            "decimal": 17,
+                            "number": 17,
                             "text": "17"
                         },
                         "first_name": {

diff --git a/cmd/flowrunner/testdata/flows/subflow.json b/cmd/flowrunner/testdata/flows/subflow.json
@@ -30,7 +30,7 @@
                         "cases": [
                             {
                                 "uuid": "19a95efc-ac69-4b6a-a90b-f84a60b49e4f",
-                                "type": "is_string_eq",
+                                "type": "is_text_eq",
                                 "arguments": [
                                     "completed"
                                 ],

diff --git a/cmd/flowrunner/testdata/flows/subflow_other.json b/cmd/flowrunner/testdata/flows/subflow_other.json
@@ -35,7 +35,7 @@
                         "type": "switch",
                         "cases": [
                             {
-                                "type": "is_string_eq",
+                                "type": "is_text_eq",
                                 "uuid": "57eda3da-817b-4942-a5fc-e1ea5d12c82d",
                                 "arguments": [
                                     "completed"

diff --git a/cmd/flowrunner/testdata/flows/webhook_persists.json b/cmd/flowrunner/testdata/flows/webhook_persists.json
@@ -56,7 +56,7 @@
                                 ],
                                 "uuid": "789b45bc-005a-46db-8331-6a966c0141c2",
                                 "exit_uuid": "bb09f6b6-89f4-45bd-8cc9-1d4655914590",
-                                "type": "is_string_eq"
+                                "type": "is_text_eq"
                             }
                         ],
                         "default_exit_uuid": "3699df6c-15f0-4a86-b7f8-9fe1497e7854",

diff --git a/contactql/parser_test.go b/contactql/parser_test.go
@@ -91,7 +91,7 @@ func TestEvaluateQuery(t *testing.T) {
 		{`Gender is MALE`, true},
 		{`gender = "female"`, false},
 
-		// decimal field condition
+		// number field condition
 		{`age = 36`, true},
 		{`age is 35`, false},
 		{`age > 36`, false},
@@ -101,7 +101,7 @@ func TestEvaluateQuery(t *testing.T) {
 		{`age < 37`, true},
 		{`age <= 36`, true},
 
-		// date field condition
+		// datetime field condition
 		{`dob = 1981/05/28`, true},
 		{`dob > 1981/05/28`, false},
 		{`dob > 1981/05/27`, true},