Skip to content

Tweaks based on our requirements #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Mar 22, 2023
Merged

Tweaks based on our requirements #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ab09472
Add a local testing schema and make sure it's loaded
the21st Mar 16, 2023
81f762e
Don't suggest automatic table aliasing insert text
the21st Mar 16, 2023
221a70b
Add suggestion for unscoped columns
the21st Mar 16, 2023
24bc072
Only suggest FROM clause tables after SELECT
the21st Mar 16, 2023
ec8d2d9
Suggest catalogs, database and tables one-by-one, hierarchically
the21st Mar 16, 2023
5648c4b
Update tests :nervouslaughter:
the21st Mar 16, 2023
a1b75cf
Remove unused import
the21st Mar 16, 2023
dffeea7
Stub logger to make the lib work in browser
the21st Mar 16, 2023
241b522
Improve the "not qualified" test
the21st Mar 21, 2023
1c3c5b3
Refactor allTableNameCombinations to getFullyQualifiedTableName
the21st Mar 21, 2023
2928b24
refactor createTableCandidates
the21st Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions example/monaco_editor/.sqllsrc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"adapter": "postgres",
"host": "postgres",
"port": 5432,
"user": "sqlls",
"password": "sqlls",
"database": "postgres_db"
}
"name": "pyspark-conf",
"adapter": "json",
"filename": "testing.schema.json"
}
348 changes: 348 additions & 0 deletions example/monaco_editor/testing.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,348 @@
{
"functions": [],
"tables": [
{
"columns": [
{
"columnName": "id",
"description": "integer",
"metadata": {},
"type": "integer"
},
{
"columnName": "name",
"description": "string",
"metadata": {
"description": "new description"
},
"type": "string"
},
{
"columnName": "age",
"description": "integer",
"metadata": {},
"type": "integer"
},
{
"columnName": "books",
"description": "array",
"metadata": {},
"type": "array"
},
{
"columnName": "struct_col",
"description": "struct",
"metadata": {},
"type": "struct"
},
{
"columnName": "map_col",
"description": "map",
"metadata": {},
"type": "map"
}
],
"database": "school",
"tableName": "student"
},
{
"database": "school",
"tableName": "nested_table",
"columns": [
{
"columnName": "col1",
"description": "the desc. text"
},
{
"columnName": "struct_col",
"description": "the desc. text"
}
]
},
{
"database": "tales",
"tableName": "tbl1",
"columns": [
{
"columnName": "one",
"description": "one(Type: varchar(10), Null: No, Default: null)"
},
{
"columnName": "two",
"description": "two(Type: smallint, Null: No, Default: null)"
}
]
},
{
"database": "tales",
"tableName": "contacts",
"columns": [
{
"columnName": "contact_id",
"description": "contact_id(Type: INTEGER, Null: No, Default: null)"
},
{
"columnName": "first_name",
"description": "first_name(Type: TEXT, Null: Yes, Default: null)"
},
{
"columnName": "last_name",
"description": "last_name(Type: TEXT, Null: Yes, Default: null)"
},
{
"columnName": "email",
"description": "email(Type: TEXT, Null: Yes, Default: null)"
},
{
"columnName": "phone",
"description": "phone(Type: TEXT, Null: Yes, Default: null)"
}
]
},
{
"database": null,
"tableName": "unqualified_table",
"columns": [
{
"columnName": "group_id",
"description": "group_id(Type: INTEGER, Null: No, Default: null)"
},
{
"columnName": "name",
"description": "name(Type: TEXT, Null: Yes, Default: null)"
}
]
},
{
"database": "tales",
"catalog": "db1",
"tableName": "extra_qualified_table",
"columns": [
{
"columnName": "contact_id",
"description": "contact_id(Type: INTEGER, Null: No, Default: null)"
},
{
"columnName": "group_id",
"description": "group_id(Type: INTEGER, Null: No, Default: null)"
}
]
},
{
"database": "tales",
"tableName": "COMPANY",
"columns": [
{
"columnName": "ID",
"description": "ID(Type: INT, Null: Yes, Default: null)"
},
{
"columnName": "NAME",
"description": "NAME(Type: TEXT, Null: Yes, Default: null)"
},
{
"columnName": "AGE",
"description": "AGE(Type: INT, Null: Yes, Default: null)"
},
{
"columnName": "ADDRESS",
"description": "ADDRESS(Type: CHAR(50), Null: No, Default: null)"
},
{
"columnName": "SALARY",
"description": "SALARY(Type: REAL, Null: No, Default: null)"
}
]
},
{
"database": "tales",
"tableName": "employees",
"columns": [
{
"columnName": "job_id",
"description": ""
},
{
"columnName": "employee_id",
"description": ""
},
{
"columnName": "manager_id",
"description": ""
},
{
"columnName": "department_id",
"description": ""
},
{
"columnName": "first_name",
"description": ""
},
{
"columnName": "last_name",
"description": ""
},
{
"columnName": "email",
"description": ""
},
{
"columnName": "phone_number",
"description": ""
},
{
"columnName": "hire_date",
"description": ""
},
{
"columnName": "salary",
"description": ""
},
{
"columnName": "commision_pct",
"description": ""
}
]
},
{
"database": "tales",
"tableName": "jobs",
"columns": [
{
"columnName": "job_id",
"description": ""
},
{
"columnName": "job_title",
"description": ""
},
{
"columnName": "min_salary",
"description": ""
},
{
"columnName": "max_salary",
"description": ""
},
{
"columnName": "created_at",
"description": ""
},
{
"columnName": "updated_at",
"description": ""
}
]
},
{
"database": "tales",
"tableName": "job_history",
"columns": [
{
"columnName": "employee_id",
"description": ""
},
{
"columnName": "start_date",
"description": ""
},
{
"columnName": "end_date",
"description": ""
},
{
"columnName": "job_id",
"description": ""
},
{
"columnName": "department_id",
"description": ""
}
]
},
{
"database": "tales",
"tableName": "departments",
"columns": [
{
"columnName": "department_id",
"description": ""
},
{
"columnName": "department_name",
"description": ""
},
{
"columnName": "manager_id",
"description": ""
},
{
"columnName": "location_id",
"description": ""
}
]
},
{
"database": "tales",
"tableName": "locations",
"columns": [
{
"columnName": "location_id",
"description": ""
},
{
"columnName": "street_address",
"description": ""
},
{
"columnName": "postal_code",
"description": ""
},
{
"columnName": "city",
"description": ""
},
{
"columnName": "state_province",
"description": ""
},
{
"columnName": "country_id",
"description": ""
}
]
},
{
"database": "tales",
"tableName": "countries",
"columns": [
{
"columnName": "country_id",
"description": ""
},
{
"columnName": "country_name",
"description": ""
},
{
"columnName": "region_id",
"description": ""
}
]
},
{
"database": "tales",
"tableName": "regions",
"columns": [
{
"columnName": "region_id",
"description": ""
},
{
"columnName": "region_name",
"description": ""
}
]
}
]
}
9 changes: 1 addition & 8 deletions packages/server/src/complete/Identifier.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { CompletionItem, CompletionItemKind } from 'vscode-languageserver-types'
import { makeTableAlias } from './StringUtils'

export const ICONS = {
KEYWORD: CompletionItemKind.Text,
Expand Down Expand Up @@ -46,14 +45,12 @@ export class Identifier {
const idx = this.lastToken.lastIndexOf('.')
const label = this.identifier.substring(idx + 1)
let kindName: string
let tableAlias = ''
if (this.kind === ICONS.TABLE) {
let tableName = label
const i = tableName.lastIndexOf('.')
if (i > 0) {
tableName = label.substring(i + 1)
}
tableAlias = this.onClause === 'FROM' ? makeTableAlias(tableName) : ''
kindName = 'table'
} else {
kindName = 'column'
Expand All @@ -66,11 +63,7 @@ export class Identifier {
}

if (this.kind === ICONS.TABLE) {
if (tableAlias) {
item.insertText = `${label} AS ${tableAlias}`
} else {
item.insertText = label
}
item.insertText = label
}
return item
}
Expand Down
Loading