Skip to content

Commit 9b6c7aa

Browse files
psteinroepsteinroe
committed
save progress
1 parent beeb661 commit 9b6c7aa

4 files changed

Lines changed: 104 additions & 34 deletions

File tree

‎crates/pgt_typecheck/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ mod typed_identifier;
33

44
use diagnostics::create_type_error;
55
pub use diagnostics::TypecheckDiagnostic;
6+
pub use typed_identifier::TypedIdentifier;
67
use pgt_text_size::TextRange;
78
use sqlx::postgres::PgDatabaseError;
89
pub use sqlx::postgres::PgSeverity;
910
use sqlx::{Executor, PgPool};
10-
use typed_identifier::{apply_identifiers, TypedIdentifier};
11+
use typed_identifier::apply_identifiers;
1112

1213
#[derive(Debug)]
1314
pub struct TypecheckParams<'a> {
@@ -16,7 +17,6 @@ pub struct TypecheckParams<'a> {
1617
pub ast: &'a pgt_query_ext::NodeEnum,
1718
pub tree: &'a tree_sitter::Tree,
1819
pub schema_cache: &'a pgt_schema_cache::SchemaCache,
19-
pub cst: &'a tree_sitter::Node<'a>,
2020
pub identifiers: Vec<TypedIdentifier>,
2121
}
2222

@@ -59,7 +59,7 @@ pub async fn check_sql(
5959
let prepared = apply_identifiers(
6060
params.identifiers,
6161
params.schema_cache,
62-
params.cst,
62+
params.tree,
6363
params.sql,
6464
);
6565

‎crates/pgt_typecheck/src/typed_identifier.rs‎

Lines changed: 33 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,48 @@
1+
#[derive(Debug)]
2+
pub struct Type {
3+
pub schema: Option<String>,
4+
pub name: String,
5+
pub oid: i32,
6+
}
7+
18
#[derive(Debug)]
29
pub struct TypedIdentifier {
310
pub schema: Option<String>,
4-
pub relation: String,
11+
pub relation: Option<String>,
512
pub name: String,
6-
pub type_: String,
13+
pub type_: Type,
14+
}
15+
16+
impl TypedIdentifier {
17+
pub fn new(
18+
schema: Option<String>,
19+
relation: Option<String>,
20+
name: String,
21+
type_: Type,
22+
) -> Self {
23+
TypedIdentifier {
24+
schema,
25+
relation,
26+
name,
27+
type_,
28+
}
29+
}
30+
31+
pub fn default_value(&self, schema_cache: &pgt_schema_cache::SchemaCache) -> String {
32+
"NULL".to_string()
33+
}
734
}
835

936
/// Applies the identifiers to the SQL string by replacing them with their default values.
1037
pub fn apply_identifiers<'a>(
1138
identifiers: Vec<TypedIdentifier>,
1239
schema_cache: &'a pgt_schema_cache::SchemaCache,
13-
cst: &'a tree_sitter::Node<'a>,
40+
cst: &'a tree_sitter::Tree,
1441
sql: &'a str,
1542
) -> &'a str {
1643
// TODO
44+
println!("Applying identifiers to SQL: {}", sql);
45+
println!("Identifiers: {:?}", identifiers);
46+
println!("CST: {:#?}", cst);
1747
sql
1848
}

‎crates/pgt_typecheck/tests/diagnostics.rs‎

Lines changed: 60 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,28 @@ use pgt_console::{
44
};
55
use pgt_diagnostics::PrintDiagnostic;
66
use pgt_test_utils::test_database::get_new_test_db;
7-
use pgt_typecheck::{TypecheckParams, check_sql};
7+
use pgt_typecheck::{check_sql, TypecheckParams};
88
use sqlx::Executor;
99

10-
async fn test(name: &str, query: &str, setup: &str) {
10+
async fn test(name: &str, query: &str, setup: Option<&str>) {
1111
let test_db = get_new_test_db().await;
1212

13-
test_db
14-
.execute(setup)
15-
.await
16-
.expect("Failed to setup test database");
13+
if let Some(setup) = setup {
14+
test_db
15+
.execute(setup)
16+
.await
17+
.expect("Failed to setup test database");
18+
}
1719

1820
let mut parser = tree_sitter::Parser::new();
1921
parser
2022
.set_language(tree_sitter_sql::language())
2123
.expect("Error loading sql language");
2224

25+
let schema_cache = pgt_schema_cache::SchemaCache::load(&test_db)
26+
.await
27+
.expect("Failed to load Schema Cache");
28+
2329
let root = pgt_query_ext::parse(query).unwrap();
2430
let tree = parser.parse(query, None).unwrap();
2531

@@ -29,40 +35,72 @@ async fn test(name: &str, query: &str, setup: &str) {
2935
sql: query,
3036
ast: &root,
3137
tree: &tree,
38+
schema_cache: &schema_cache,
39+
identifiers: vec![],
3240
})
3341
.await;
3442

35-
let mut content = vec![];
36-
let mut writer = HTML::new(&mut content);
37-
38-
Formatter::new(&mut writer)
39-
.write_markup(markup! {
40-
{PrintDiagnostic::simple(&result.unwrap().unwrap())}
41-
})
42-
.unwrap();
43-
44-
let content = String::from_utf8(content).unwrap();
43+
// let mut content = vec![];
44+
// let mut writer = HTML::new(&mut content);
4545

46-
insta::with_settings!({
47-
prepend_module_to_snapshot => false,
48-
}, {
49-
insta::assert_snapshot!(name, content);
50-
});
46+
// Formatter::new(&mut writer)
47+
// .write_markup(markup! {
48+
// {PrintDiagnostic::simple(&result.unwrap().unwrap())}
49+
// })
50+
// .unwrap();
51+
//
52+
// let content = String::from_utf8(content).unwrap();
53+
//
54+
// insta::with_settings!({
55+
// prepend_module_to_snapshot => false,
56+
// }, {
57+
// insta::assert_snapshot!(name, content);
58+
// });
5159
}
5260

5361
#[tokio::test]
5462
async fn invalid_column() {
5563
test(
5664
"invalid_column",
5765
"select id, unknown from contacts;",
58-
r#"
66+
Some(
67+
r#"
5968
create table public.contacts (
6069
id serial primary key,
6170
name varchar(255) not null,
6271
is_vegetarian bool default false,
6372
middle_name varchar(255)
6473
);
6574
"#,
75+
),
76+
)
77+
.await;
78+
}
79+
80+
#[tokio::test]
81+
async fn sql_fn() {
82+
test(
83+
"sql_fn",
84+
"CREATE FUNCTION add(test0 integer, test1 integer) RETURNS integer
85+
AS 'select $1 + $2;'
86+
LANGUAGE SQL
87+
IMMUTABLE
88+
RETURNS NULL ON NULL INPUT;",
89+
Some(""),
90+
)
91+
.await;
92+
}
93+
94+
#[tokio::test]
95+
async fn sql_fn_named() {
96+
test(
97+
"sql_fn",
98+
"CREATE FUNCTION add(test0 integer, test1 integer) RETURNS integer
99+
AS 'select test0 + test1;'
100+
LANGUAGE SQL
101+
IMMUTABLE
102+
RETURNS NULL ON NULL INPUT;",
103+
Some(""),
66104
)
67105
.await;
68106
}

‎crates/pgt_workspace/src/workspace/server.rs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@ use async_helper::run_async;
55
use dashmap::DashMap;
66
use db_connection::DbConnection;
77
use document::Document;
8-
use futures::{StreamExt, stream};
8+
use futures::{stream, StreamExt};
99
use parsed_document::{
1010
AsyncDiagnosticsMapper, CursorPositionFilter, DefaultMapper, ExecuteStatementMapper,
1111
ParsedDocument, SyncDiagnosticsMapper,
1212
};
1313
use pgt_analyse::{AnalyserOptions, AnalysisFilter};
1414
use pgt_analyser::{Analyser, AnalyserConfig, AnalyserContext};
1515
use pgt_diagnostics::{
16-
Diagnostic, DiagnosticExt, Error, Severity, serde::Diagnostic as SDiagnostic,
16+
serde::Diagnostic as SDiagnostic, Diagnostic, DiagnosticExt, Error, Severity,
1717
};
1818
use pgt_fs::{ConfigName, PgTPath};
19-
use pgt_typecheck::TypecheckParams;
19+
use pgt_typecheck::{TypecheckParams, TypedIdentifier};
2020
use schema_cache_manager::SchemaCacheManager;
2121
use sqlx::Executor;
2222
use tracing::info;
2323

2424
use crate::{
25-
WorkspaceError,
2625
configuration::to_analyser_rules,
2726
features::{
2827
code_actions::{
2928
self, CodeAction, CodeActionKind, CodeActionsResult, CommandAction,
3029
CommandActionCategory, ExecuteStatementParams, ExecuteStatementResult,
3130
},
32-
completions::{CompletionsResult, GetCompletionsParams, get_statement_for_completions},
31+
completions::{get_statement_for_completions, CompletionsResult, GetCompletionsParams},
3332
diagnostics::{PullDiagnosticsParams, PullDiagnosticsResult},
3433
},
3534
settings::{Settings, SettingsHandle, SettingsHandleMut},
35+
WorkspaceError,
3636
};
3737

3838
use super::{
@@ -370,7 +370,7 @@ impl Workspace for WorkspaceServer {
370370
let input = parser.iter(AsyncDiagnosticsMapper).collect::<Vec<_>>();
371371
let async_results = run_async(async move {
372372
stream::iter(input)
373-
.map(|(_id, range, content, ast, cst)| {
373+
.map(|(_id, range, content, ast, cst, sign)| {
374374
let pool = pool.clone();
375375
let path = path_clone.clone();
376376
async move {
@@ -380,6 +380,8 @@ impl Workspace for WorkspaceServer {
380380
sql: &content,
381381
ast: &ast,
382382
tree: &cst,
383+
schema_cache: &self.schema_cache,
384+
identifiers: sign.map(|s| TypedIdentifier {}).unwrap_or_default(),
383385
})
384386
.await
385387
.map(|d| {

0 commit comments

Comments
 (0)