Fix for lateral use with no references

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

package-lock.json

@@ -324,11 +324,16 @@ export default class Statement {
 
 	}
 
+	private static readonly BANNED_NAMES = [`VALUES`];
 	getObjectReferences(): ObjectRef[] {
 		let list: ObjectRef[] = [];
 
 		const doAdd = (ref?: ObjectRef) => {
-			if (ref) list.push(ref);
+			if (ref) {
+				if (ref.object.name && !Statement.BANNED_NAMES.includes(ref.object.name.toUpperCase())) {
+					list.push(ref);
+				}
+			}
 		}
 
 		const basicQueryFinder = (startIndex: number): void => {
@@ -365,6 +370,14 @@ export default class Statement {
 							i += 3; //For the brackets
 						}
 					}
+				} else if (currentClause === `from` && tokenIs(this.tokens[i], `function`)) {
+					const sqlObj = this.getRefAtToken(i, {includeParameters: true});
+					if (sqlObj) {
+						i += sqlObj.tokens.length;
+						if (sqlObj.isUDTF || sqlObj.fromLateral) {
+							i += 3; //For the brackets
+						}
+					}
 				}
 			}
 		}
@@ -538,18 +551,17 @@ export default class Statement {
 		return list;
 	}
 
-	private getRefAtToken(i: number, options: {withSystemName?: boolean} = {}): ObjectRef|undefined {
+	private getRefAtToken(i: number, options: {withSystemName?: boolean, includeParameters?: boolean} = {}): ObjectRef|undefined {
 		let sqlObj: ObjectRef;
 
 		let nextIndex = i;
 		let nextToken = this.tokens[i];
 
 		let endIndex = i;
 
-		const isUDTF = tokenIs(nextToken, `function`, `TABLE`);
-		const isLateral = tokenIs(nextToken, `function`, `LATERAL`);
+		const isSubSelect = tokenIs(nextToken, `function`, `TABLE`) || tokenIs(nextToken, `function`, `LATERAL`) || (options.includeParameters && tokenIs(nextToken, `function`));
 
-		if (isUDTF) {
+		if (isSubSelect) {
 			sqlObj = this.getRefAtToken(i+2);
 			if (sqlObj) {
 				sqlObj.isUDTF = true;
@@ -563,14 +575,6 @@ export default class Statement {
 				nextIndex = -1;
 				nextToken = undefined;
 			}
-		} else if (isLateral) {
-			const blockTokens = this.getBlockAt(nextToken.range.end+1);
-			const newStatement = new Statement(blockTokens, {start: nextToken.range.start, end: blockTokens[blockTokens.length-1].range.end});
-			[sqlObj] = newStatement.getObjectReferences();
-
-			sqlObj.fromLateral = true;
-			nextIndex = i + 2 + blockTokens.length;
-			nextToken = this.tokens[nextIndex];
 
 		} else {
 			if (nextToken && NameTypes.includes(nextToken.type)) {
@@ -618,7 +622,7 @@ export default class Statement {
 				}
 			}
 
-			if (!isUDTF) {
+			if (!isSubSelect && !sqlObj.isUDTF) {
 				sqlObj.tokens = this.tokens.slice(i, endIndex+1);
 			}
 

src/language/sql/statement.ts

@@ -1105,7 +1105,29 @@ parserScenarios(`Object references`, ({newDoc}) => {
 
     expect(refs[2].object.name).toBe(`object_statistics`);
     expect(refs[2].object.schema).toBe(`qsys2`);
-    expect(refs[2].alias).toBe(`z`);
+    expect(refs[2].alias).toBe(undefined);
+  });
+
+  test('SELECT FROM LATERAL', () => {
+    const lines = [
+      `SELECT id, id_phone, t.phone_number`,
+      `  FROM testlateral AS s,`,
+      `       LATERAL(VALUES (1, S.phone1),`,
+      `                      (2, S.phone2),`,
+      `                      (3, S.phone3)) AS T(id_phone, phone_number)`,
+    ].join(`\n`);
+
+    const document = new Document(lines);
+
+    expect(document.statements.length).toBe(1);
+
+    const statement = document.statements[0];
+
+    expect(statement.type).toBe(StatementType.Select);
+
+    const refs = statement.getObjectReferences();
+    console.log(refs);
+    expect(refs.length).toBe(1);
   });
 
   test(`Multiple UDTFs`, () => {
@@ -1407,7 +1429,7 @@ parserScenarios(`PL body tests`, ({newDoc}) => {
 
     const refs = statement.getObjectReferences();
     const ctes = statement.getCTEReferences();
-
+    
     expect(refs.length).toBe(10);
     expect(refs[0].object.name).toBe(`shipments`);
     expect(refs[0].alias).toBe(`s`);