fixed bug with #4

Author: paustint

.npmignore

@@ -9,4 +9,5 @@ tsconfig.json
 SOQL.g4
 ISSUE_TEMPLATE
 CONTRIBUTING.md
-CHANGELOG.md
+CHANGELOG.md
+debug/

debug/test.js

@@ -0,0 +1,12 @@
+var soqlParserJs = require('../dist');
+
+const query = `
+SELECT a.Id, a.Name,
+(SELECT a2.Id FROM ChildAccounts a2),
+(SELECT a1.Id FROM ChildAccounts1 a1)
+FROM Account a
+`;
+
+const parsedQuery = soqlParserJs.parseQuery(query, { logging: true });
+
+console.log(JSON.stringify(parsedQuery, null, 2));

dist/SoqlListener.js

@@ -151,10 +151,10 @@ class Listener {
             console.log('enterAlias_name:', ctx.text);
         }
         if (this.context.currentItem === 'from') {
-            this.soqlQuery.sObjectAlias = ctx.text;
+            this.getSoqlQuery().sObjectAlias = ctx.text;
             // All fields need to update to remove the alias from relationships
-            this.soqlQuery.fields.forEach(field => {
-                if (field.text.startsWith(`${ctx.text}.`)) {
+            this.getSoqlQuery().fields.forEach(field => {
+                if (field.text && field.text.startsWith(`${ctx.text}.`)) {
                     field.alias = ctx.text;
                     field.text = field.text.replace(`${ctx.text}.`, '');
                     if (field.relationshipFields.length > 2) {
@@ -743,9 +743,16 @@ class Listener {
         }
         this.getSoqlQuery().sObject = ctx.getChild(0).text;
         if (this.config.includeSubqueryAsField && this.context.isSubQuery) {
-            this.soqlQuery.fields.push({
-                subqueryObjName: ctx.text,
-            });
+            if (ctx.getChild(0).text.includes('.')) {
+                this.soqlQuery.fields.push({
+                    subqueryObjName: ctx.text,
+                });
+            }
+            else {
+                this.soqlQuery.fields.push({
+                    subqueryObjName: ctx.getChild(0).text,
+                });
+            }
         }
     }
     exitObject_spec(ctx) {

docs/package-lock.json

@@ -11,7 +11,7 @@
     "react-copy-to-clipboard": "^5.0.1",
     "react-dom": "^16.5.2",
     "react-scripts-ts": "3.1.0",
-    "soql-parser-js": "^0.1.1"
+    "soql-parser-js": "^0.1.5"
   },
   "scripts": {
     "start": "react-scripts-ts start",

docs/package.json

@@ -185,10 +185,10 @@ export class Listener implements SOQLListener {
       console.log('enterAlias_name:', ctx.text);
     }
     if (this.context.currentItem === 'from') {
-      this.soqlQuery.sObjectAlias = ctx.text;
+      this.getSoqlQuery().sObjectAlias = ctx.text;
       // All fields need to update to remove the alias from relationships
-      this.soqlQuery.fields.forEach(field => {
-        if (field.text.startsWith(`${ctx.text}.`)) {
+      this.getSoqlQuery().fields.forEach(field => {
+        if (field.text && field.text.startsWith(`${ctx.text}.`)) {
           field.alias = ctx.text;
           field.text = field.text.replace(`${ctx.text}.`, '');
           if (field.relationshipFields.length > 2) {
@@ -777,9 +777,15 @@ export class Listener implements SOQLListener {
     }
     this.getSoqlQuery().sObject = ctx.getChild(0).text;
     if (this.config.includeSubqueryAsField && this.context.isSubQuery) {
-      this.soqlQuery.fields.push({
-        subqueryObjName: ctx.text,
-      });
+      if (ctx.getChild(0).text.includes('.')) {
+        this.soqlQuery.fields.push({
+          subqueryObjName: ctx.text,
+        });
+      } else {
+        this.soqlQuery.fields.push({
+          subqueryObjName: ctx.getChild(0).text,
+        });
+      }
     }
   }
   exitObject_spec(ctx: Parser.Object_specContext) {

lib/SoqlListener.ts

@@ -1,6 +1,6 @@
 {
   "name": "soql-parser-js",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Salesforce.com SOQL parser.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package.json

@@ -957,5 +957,53 @@ export const testCases: TestCase[] = [
       },
     },
   },
+  {
+    testCase: 34,
+    soql: `SELECT a.Id, a.Name, (SELECT a2.Id FROM ChildAccounts a2), (SELECT a1.Id FROM ChildAccounts1 a1) FROM Account a`,
+    output: {
+      fields: [
+        {
+          text: 'Id',
+          alias: 'a',
+        },
+        {
+          text: 'Name',
+          alias: 'a',
+        },
+        {
+          subqueryObjName: 'ChildAccounts',
+        },
+        {
+          subqueryObjName: 'ChildAccounts1',
+        },
+      ],
+      subqueries: [
+        {
+          fields: [
+            {
+              text: 'Id',
+              alias: 'a2',
+            },
+          ],
+          subqueries: [],
+          sObject: 'ChildAccounts',
+          sObjectAlias: 'a2',
+        },
+        {
+          fields: [
+            {
+              text: 'Id',
+              alias: 'a1',
+            },
+          ],
+          subqueries: [],
+          sObject: 'ChildAccounts1',
+          sObjectAlias: 'a1',
+        },
+      ],
+      sObject: 'Account',
+      sObjectAlias: 'a',
+    },
+  },
 ];
 export default testCases;