Merge pull request #60 from paustint/bug-59

The field Format fails if it is in a query #59

Author: paustint

debug/test.js

@@ -1,6 +1,6 @@
 var soqlParserJs = require('./lib');
 
-const query = `@`;
+const query = `SELECT Id, Format, Foo FROM Account`;
 // const query = `
 // SELECT Id, Name, FORMAT(Amount),
 //   (SELECT Quantity, ListPrice, PricebookEntry.UnitPrice, PricebookEntry.Name FROM OpportunityLineItems)

lib/SoqlListener.ts

@@ -464,7 +464,7 @@ export class Listener implements SOQLListener {
     if (this.config.logging) {
       console.log('enterFunction_name:', ctx.text);
     }
-    if (this.context.currentItem === 'field') {
+    if (this.context.currentItem === 'field' && this.context.currentFieldFn) {
       if (!this.context.currentFieldFn.fn) {
         this.context.currentFieldFn.fn = ctx.text;
       }

test/TestCases.ts

@@ -1675,5 +1675,63 @@ export const testCases: TestCase[] = [
       },
     },
   },
+  {
+    testCase: 55,
+    soql:
+      'SELECT Id, CreatedById, CreatedDate, DefType, IsDeleted, Format, LastModifiedById, LastModifiedDate, AuraDefinitionBundleId, ManageableState, Source, SystemModstamp FROM AuraDefinition',
+    output: {
+      fields: [
+        {
+          type: 'Field',
+          field: 'Id',
+        },
+        {
+          type: 'Field',
+          field: 'CreatedById',
+        },
+        {
+          type: 'Field',
+          field: 'CreatedDate',
+        },
+        {
+          type: 'Field',
+          field: 'DefType',
+        },
+        {
+          type: 'Field',
+          field: 'IsDeleted',
+        },
+        {
+          type: 'Field',
+          field: 'Format',
+        },
+        {
+          type: 'Field',
+          field: 'LastModifiedById',
+        },
+        {
+          type: 'Field',
+          field: 'LastModifiedDate',
+        },
+        {
+          type: 'Field',
+          field: 'AuraDefinitionBundleId',
+        },
+        {
+          type: 'Field',
+          field: 'ManageableState',
+        },
+        {
+          type: 'Field',
+          field: 'Source',
+        },
+        {
+          type: 'Field',
+          field: 'SystemModstamp',
+        },
+      ],
+      sObject: 'AuraDefinition',
+    },
+  },
 ];
 export default testCases;

test/TestCasesForIsValid.ts

@@ -150,5 +150,10 @@ export const testCases: TestCaseForFormat[] = [
     soql: 'select some fake text',
     isValid: false,
   },
+  {
+    testCase: 30,
+    soql: 'SELECT Id, Format FROM Account',
+    isValid: true,
+  },
 ];
 export default testCases;