For empty select statement, suggest unscoped columns

But only if no scoped columns were suggested

Author: the21st

packages/server/src/complete/complete.ts

@@ -249,7 +249,13 @@ class Completer {
       ) || []
     this.addCandidatesForExpectedLiterals(expectedLiteralNodes)
     this.addCandidatesForFunctions()
-    this.addCandidatesForScopedColumns(fromNodes, schemaAndSubqueries)
+    const { addedSome } = this.addCandidatesForScopedColumns(
+      fromNodes,
+      schemaAndSubqueries
+    )
+    if (!addedSome) {
+      this.addCandidatesForUnscopedColumns(fromNodes, schemaAndSubqueries)
+    }
     this.addCandidatesForAliases(fromNodes)
     this.addCandidatesForTables(schemaAndSubqueries, true)
     if (logger.isDebugEnabled())
@@ -379,14 +385,20 @@ class Completer {
     console.timeEnd('addCandidatesForSelectStar')
   }
 
-  addCandidatesForScopedColumns(fromNodes: FromTableNode[], tables: Table[]) {
+  addCandidatesForScopedColumns(
+    fromNodes: FromTableNode[],
+    tables: Table[]
+  ): { addedSome: boolean } {
     console.time('addCandidatesForScopedColumns')
+    let addedSome = false
     createCandidatesForScopedColumns(fromNodes, tables, this.lastToken).forEach(
       (v) => {
+        addedSome = true
         this.addCandidate(v)
       }
     )
     console.timeEnd('addCandidatesForScopedColumns')
+    return { addedSome }
   }
 
   addCandidatesForUnscopedColumns(fromNodes: FromTableNode[], tables: Table[]) {

packages/server/test/complete.test.ts

@@ -174,7 +174,6 @@ describe('on blank space', () => {
 
   test('complete inside SELECT', () => {
     const result = complete('SELECT ', { line: 0, column: 7 }, SIMPLE_SCHEMA)
-    expect(result.candidates.length).toEqual(12) // TODO whare are they?
     const expected = [
       expect.objectContaining({ label: 'array_concat()' }),
       expect.objectContaining({ label: 'array_contains()' }),
@@ -450,7 +449,6 @@ describe('Fully qualified table names', () => {
       { line: 0, column: 31 },
       SIMPLE_NESTED_SCHEMA
     )
-    expect(result.candidates.length).toEqual(1)
     const expected = [expect.objectContaining({ label: 'table3' })]
     expect(result.candidates).toEqual(expect.arrayContaining(expected))
   })
@@ -880,18 +878,18 @@ test('complete aliased column inside function', () => {
   expect(result.candidates[0].label).toEqual('department_id')
 })
 
-test('complete column inside function', () => {
-  const sql = `SELECT TO_CHAR(empl, 'MM/DD/YYYY') FROM employees x`
+test('complete table inside function', () => {
+  const sql = `SELECT TO_CHAR(empl, 'MM/DD/YYYY') FROM employees`
   const result = complete(sql, { line: 0, column: 19 }, COMPLEX_SCHEMA)
-  expect(result.candidates.length).toEqual(1)
-  expect(result.candidates[0].label).toEqual('employees')
+  const expected = [expect.objectContaining({ label: 'employees' })]
+  expect(result.candidates).toEqual(expect.arrayContaining(expected))
 })
 
 test('complete an alias inside function', () => {
   const sql = `SELECT TO_CHAR(an_ali, 'MM/DD/YYYY') FROM employees an_alias`
   const result = complete(sql, { line: 0, column: 21 }, COMPLEX_SCHEMA)
-  expect(result.candidates.length).toEqual(1)
-  expect(result.candidates[0].label).toEqual('an_alias')
+  const expected = [expect.objectContaining({ label: 'an_alias' })]
+  expect(result.candidates).toEqual(expect.arrayContaining(expected))
 })
 
 describe('From clause subquery', () => {