Merge branch 'main' of https://github.com/adetunjii/FerretDB into fix…

…/group-stage-consumevalues
FerretDB · Sep 12, 2023 · 3c786a7 · 3c786a7
2 parents 17e1855 + ee5304e
commit 3c786a7
Show file tree

Hide file tree

Showing 5 changed files with 93 additions and 8 deletions.
diff --git a/Taskfile.yml b/Taskfile.yml
@@ -186,7 +186,7 @@ tasks:
     deps:
       - test-integration-pg
       - test-integration-mongodb
-      # no test-integration-sqlite yet
+      - test-integration-sqlite
       # no test-integration-hana
 
   test-integration-pg:

diff --git a/integration/helpers.go b/integration/helpers.go
@@ -401,22 +401,33 @@ func CollectKeys(t testtb.TB, doc bson.D) []string {
 
 // FetchAll fetches all documents from the cursor, closing it.
 func FetchAll(t testtb.TB, ctx context.Context, cursor *mongo.Cursor) []bson.D {
+	t.Helper()
+
 	var res []bson.D
 	err := cursor.All(ctx, &res)
 	require.NoError(t, cursor.Close(ctx))
 	require.NoError(t, err)
 	return res
 }
 
-// FindAll returns all documents from the given collection sorted by _id.
-func FindAll(t testtb.TB, ctx context.Context, collection *mongo.Collection) []bson.D {
+// FilterAll returns filtered documented from the given collection sorted by _id.
+func FilterAll(t testtb.TB, ctx context.Context, collection *mongo.Collection, filter bson.D) []bson.D {
+	t.Helper()
+
 	opts := options.Find().SetSort(bson.D{{"_id", 1}})
-	cursor, err := collection.Find(ctx, bson.D{}, opts)
+	cursor, err := collection.Find(ctx, filter, opts)
 	require.NoError(t, err)
 
 	return FetchAll(t, ctx, cursor)
 }
 
+// FindAll returns all documents from the given collection sorted by _id.
+func FindAll(t testtb.TB, ctx context.Context, collection *mongo.Collection) []bson.D {
+	t.Helper()
+
+	return FilterAll(t, ctx, collection, bson.D{})
+}
+
 // generateDocuments generates documents with _id ranging from startID to endID.
 // It returns bson.A and []bson.D both containing same bson.D documents.
 func generateDocuments(startID, endID int32) (bson.A, []bson.D) {

diff --git a/integration/query_test.go b/integration/query_test.go
@@ -1044,3 +1044,32 @@ func TestQueryCommandLimitPushDown(t *testing.T) {
 		})
 	}
 }
+
+// TestQueryIDDoc checks that the order of fields in the _id document matters.
+func TestQueryIDDoc(t *testing.T) {
+	t.Parallel()
+
+	ctx, collection := setup.Setup(t)
+
+	_, err := collection.InsertOne(ctx, bson.D{
+		{"_id", bson.D{{"a", int32(1)}, {"z", int32(2)}}},
+		{"v", int32(1)},
+	})
+	require.NoError(t, err)
+	_, err = collection.InsertOne(ctx, bson.D{
+		{"_id", bson.D{{"a", int32(3)}, {"z", int32(4)}}},
+		{"v", int32(2)},
+	})
+	require.NoError(t, err)
+
+	expected := []bson.D{{
+		{"_id", bson.D{{"a", int32(3)}, {"z", int32(4)}}},
+		{"v", int32(2)},
+	}}
+	actual := FilterAll(t, ctx, collection, bson.D{{"_id", bson.D{{"a", int32(3)}, {"z", int32(4)}}}})
+	AssertEqualDocumentsSlice(t, expected, actual)
+
+	expected = []bson.D{}
+	actual = FilterAll(t, ctx, collection, bson.D{{"_id", bson.D{{"z", int32(4)}, {"a", int32(3)}}}})
+	AssertEqualDocumentsSlice(t, expected, actual)
+}
diff --git a/integration/update_field_test.go b/integration/update_field_test.go
@@ -87,6 +87,51 @@ func TestUpdateFieldSet(t *testing.T) {
 	}
 }
 
+// TestUpdateFieldSetIDDoc checks that the order of fields in the _id document matters.
+func TestUpdateFieldSetIDDoc(t *testing.T) {
+	t.Parallel()
+
+	ctx, collection := setup.Setup(t)
+
+	_, err := collection.InsertOne(ctx, bson.D{
+		{"_id", bson.D{{"a", int32(1)}, {"z", int32(2)}}},
+		{"v", int32(1)},
+	})
+	require.NoError(t, err)
+	_, err = collection.InsertOne(ctx, bson.D{
+		{"_id", bson.D{{"a", int32(3)}, {"z", int32(4)}}},
+		{"v", int32(2)},
+	})
+	require.NoError(t, err)
+
+	res, err := collection.UpdateByID(
+		ctx,
+		bson.D{{"a", int32(3)}, {"z", int32(4)}},
+		bson.D{{"$set", bson.D{{"v", int32(3)}}}},
+	)
+	require.NoError(t, err)
+	assert.Equal(t, &mongo.UpdateResult{MatchedCount: 1, ModifiedCount: 1}, res)
+
+	expected := []bson.D{{
+		{"_id", bson.D{{"a", int32(1)}, {"z", int32(2)}}},
+		{"v", int32(1)},
+	}, {
+		{"_id", bson.D{{"a", int32(3)}, {"z", int32(4)}}},
+		{"v", int32(3)},
+	}}
+	AssertEqualDocumentsSlice(t, expected, FindAll(t, ctx, collection))
+
+	res, err = collection.UpdateByID(
+		ctx,
+		bson.D{{"z", int32(4)}, {"a", int32(3)}},
+		bson.D{{"$set", bson.D{{"v", int32(4)}}}},
+	)
+	require.NoError(t, err)
+	assert.Equal(t, new(mongo.UpdateResult), res)
+
+	AssertEqualDocumentsSlice(t, expected, FindAll(t, ctx, collection))
+}
+
 func TestUpdateFieldSetUpdateManyUpsert(t *testing.T) {
 	t.Parallel()
 

diff --git a/internal/backends/sqlite/metadata/metadata.go b/internal/backends/sqlite/metadata/metadata.go
@@ -31,11 +31,11 @@ import (
 // TODO https://github.com/FerretDB/FerretDB/issues/226
 
 const (
-	// IDColumn is a SQLite path expression for _id field.
-	IDColumn = "_ferretdb_sjson->'$._id'"
-
-	// DefaultColumn is a column name for all fields expect _id.
+	// DefaultColumn is a column name for all fields.
 	DefaultColumn = "_ferretdb_sjson"
+
+	// IDColumn is a SQLite path expression for _id field.
+	IDColumn = DefaultColumn + "->'$._id'"
 )
 
 // Collection represents collection metadata.