fix failing tests

sourcenetwork · Feb 6, 2025 · 697afea · 697afea
1 parent f0c4a49
commit 697afea
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 28 deletions.
diff --git a/internal/db/base/compare.go b/internal/db/base/compare.go
@@ -11,6 +11,7 @@
 package base
 
 import (
+	"bytes"
 	"strings"
 	"time"
 )
@@ -44,6 +45,8 @@ func Compare(a, b any) int {
 		return compareTime(v, b.(time.Time))
 	case string:
 		return compareString(v, b.(string))
+	case []byte:
+		return compareBytes(v, b.([]byte))
 	default:
 		return 0
 	}
@@ -93,3 +96,6 @@ func compareTime(a, b time.Time) int {
 func compareString(a, b string) int {
 	return strings.Compare(a, b)
 }
+func compareBytes(a, b []byte) int {
+	return bytes.Compare(a, b)
+}
diff --git a/tests/integration/query/simple/utils.go b/tests/integration/query/simple/utils.go
@@ -22,8 +22,6 @@ var userCollectionGQLSchema = (`
 		Email: String
 		Age: Int
 		HeightM: Float
-		Points: Float32
-		Raw: Blob
 		Verified: Boolean
 		CreatedAt: DateTime
 	}

diff --git a/tests/integration/query/simple/with_order_test.go b/tests/integration/query/simple/with_order_test.go
@@ -47,14 +47,14 @@ func TestQuerySimpleWithEmptyOrder(t *testing.T) {
 				}`,
 				Results: map[string]any{
 					"Users": []map[string]any{
-						{
-							"Name": "Bob",
-							"Age":  int64(32),
-						},
 						{
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
+						{
+							"Name": "Bob",
+							"Age":  int64(32),
+						},
 						{
 							"Name": "John",
 							"Age":  int64(21),
@@ -134,6 +134,12 @@ func TestQuerySimpleWithFloat32OrderAscending(t *testing.T) {
 	test := testUtils.TestCase{
 		Description: "Simple query with basic order ASC",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					Points: Float32
+				}`,
+			},
 			testUtils.CreateDoc{
 				Doc: `{
 					"Name": "John",
@@ -189,13 +195,19 @@ func TestQuerySimpleWithFloat32OrderAscending(t *testing.T) {
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
 
 func TestQuerySimpleWithFloat64OrderAscending(t *testing.T) {
 	test := testUtils.TestCase{
 		Description: "Simple query with basic order ASC",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					HeightM: Float
+				}`,
+			},
 			testUtils.CreateDoc{
 				Doc: `{
 					"Name": "John",
@@ -251,13 +263,19 @@ func TestQuerySimpleWithFloat64OrderAscending(t *testing.T) {
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
 
 func TestQuerySimpleWithBlobOrderAscending(t *testing.T) {
 	test := testUtils.TestCase{
 		Description: "Simple query with basic order ASC",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					Raw: Blob
+				}`,
+			},
 			testUtils.CreateDoc{
 				DocMap: map[string]any{
 					"Name": "John",
@@ -313,7 +331,7 @@ func TestQuerySimpleWithBlobOrderAscending(t *testing.T) {
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
 
 func TestQuerySimpleWithDateTimeOrderAscending(t *testing.T) {
@@ -448,6 +466,12 @@ func TestQuerySimpleWithFloat32OrderDescending(t *testing.T) {
 	test := testUtils.TestCase{
 		Description: "Simple query with basic order DESC",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					Points: Float32
+				}`,
+			},
 			testUtils.CreateDoc{
 				Doc: `{
 					"Name": "John",
@@ -503,13 +527,19 @@ func TestQuerySimpleWithFloat32OrderDescending(t *testing.T) {
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
 
 func TestQuerySimpleWitFloat64OrderDescending(t *testing.T) {
 	test := testUtils.TestCase{
 		Description: "Simple query with basic order DESC",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					HeightM: Float
+				}`,
+			},
 			testUtils.CreateDoc{
 				Doc: `{
 					"Name": "John",
@@ -565,13 +595,19 @@ func TestQuerySimpleWitFloat64OrderDescending(t *testing.T) {
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
 
 func TestQuerySimpleWithBlobOrderDescending(t *testing.T) {
 	test := testUtils.TestCase{
 		Description: "Simple query with basic order DESC",
 		Actions: []any{
+			testUtils.SchemaUpdate{
+				Schema: `type Users {
+					Name: String
+					Raw: Blob
+				}`,
+			},
 			testUtils.CreateDoc{
 				DocMap: map[string]any{
 					"Name": "John",
@@ -627,7 +663,7 @@ func TestQuerySimpleWithBlobOrderDescending(t *testing.T) {
 		},
 	}
 
-	executeTestCase(t, test)
+	testUtils.ExecuteTestCase(t, test)
 }
 
 func TestQuerySimpleWithDateTimeOrderDescending(t *testing.T) {
@@ -1071,22 +1107,22 @@ func TestQuerySimple_WithEmptyAliasOrder_ShouldDoNothing(t *testing.T) {
 				}`,
 				Results: map[string]any{
 					"Users": []map[string]any{
-						{
-							"Name": "Bob",
-							"Age":  int64(32),
-						},
-						{
-							"Name": "Alice",
-							"Age":  int64(19),
-						},
 						{
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
+						{
+							"Name": "Bob",
+							"Age":  int64(32),
+						},
 						{
 							"Name": "John",
 							"Age":  int64(21),
 						},
+						{
+							"Name": "Alice",
+							"Age":  int64(19),
+						},
 					},
 				},
 			},
@@ -1133,22 +1169,22 @@ func TestQuerySimple_WithNullAliasOrder_ShouldDoNothing(t *testing.T) {
 				}`,
 				Results: map[string]any{
 					"Users": []map[string]any{
-						{
-							"Name": "Bob",
-							"Age":  int64(32),
-						},
-						{
-							"Name": "Alice",
-							"Age":  int64(19),
-						},
 						{
 							"Name": "Carlo",
 							"Age":  int64(55),
 						},
+						{
+							"Name": "Bob",
+							"Age":  int64(32),
+						},
 						{
 							"Name": "John",
 							"Age":  int64(21),
 						},
+						{
+							"Name": "Alice",
+							"Age":  int64(19),
+						},
 					},
 				},
 			},