fix: fix listCollections rule/improve tests (#275)

gravity-ui · Dec 28, 2024 · 7ba9e71 · 7ba9e71
1 parent 0f5f081
commit 7ba9e71
Show file tree

Hide file tree

Showing 12 changed files with 1,586 additions and 858 deletions.
diff --git a/src/autocomplete/databases/mongo/generated/MongoParser.interp b/src/autocomplete/databases/mongo/generated/MongoParser.interp
diff --git a/src/autocomplete/databases/mongo/generated/MongoParser.ts b/src/autocomplete/databases/mongo/generated/MongoParser.ts
diff --git a/src/autocomplete/databases/mongo/grammar/MongoParser.g4 b/src/autocomplete/databases/mongo/grammar/MongoParser.g4
@@ -252,7 +252,7 @@ databaseRenameCollectionArgument3
 
 databaseListCollectionsMethod
     : LIST_COLLECTIONS LPAREN (
-        databaseListCollectionsArgument1 (COMMA databaseListCollectionsArgument2)
+        databaseListCollectionsArgument1 (COMMA databaseListCollectionsArgument2)?
     )? RPAREN
     ;
 

diff --git a/src/autocomplete/databases/mongo/tests/admin/admin.test.ts b/src/autocomplete/databases/mongo/tests/admin/admin.test.ts
@@ -23,6 +23,7 @@ test('should not report errors on admin statements', () => {
 
 test('should not report errors on extended admin statements', () => {
     const autocompleteResult = parseMongoQueryWithoutCursor(`
+        db.admin().command({ping: 1});
         db.admin().command(
             {
                 ping: 1
@@ -52,7 +53,9 @@ test('should not report errors on extended admin statements', () => {
         db.admin().replSetGetStatus({
             test_option: 'test_value',
         });
-        db.admin().validateCollection('test_collection');
+        db.admin().validateCollection('test_collection', {
+            test_option: 'test_value',
+        });
     `);
 
     expect(autocompleteResult.errors).toHaveLength(0);
@@ -77,14 +80,17 @@ test('should suggest keywords after db.admin().', () => {
 test('should extract admin commands properly', () => {
     const result = extractMongoCommandsFromQuery(`
         db.admin().command({ping: 1});
+        db.admin().command({ping: 1}, {test_option: 'test_value'});
         db.admin().removeUser('test_user');
         db.admin().buildInfo();
         db.admin().serverInfo();
         db.admin().serverStatus();
         db.admin().ping();
         db.admin().listDatabases();
         db.admin().replSetGetStatus();
-        db.admin().validateCollection('test_collection');
+        db.admin().validateCollection('test_collection', {
+            test_option: 'test_value',
+        });
     `);
 
     const commands: Command[] = [
@@ -96,6 +102,15 @@ test('should extract admin commands properly', () => {
                 document: {ping: 1},
             },
         },
+        {
+            type: 'database',
+            method: 'admin',
+            childMethod: {
+                method: 'command',
+                document: {ping: 1},
+                options: {test_option: 'test_value'},
+            },
+        },
         {
             type: 'database',
             method: 'admin',
@@ -152,6 +167,9 @@ test('should extract admin commands properly', () => {
             childMethod: {
                 method: 'validateCollection',
                 collectionName: 'test_collection',
+                options: {
+                    test_option: 'test_value',
+                },
             },
         },
     ];