Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
[submodule "libpg_query"]
path = libpg_query
url = https://github.com/pganalyze/libpg_query.git
[submodule "crates/tree_sitter_sql/tree-sitter-sql"]
path = crates/tree_sitter_sql/tree-sitter-sql
url = https://github.com/DerekStride/tree-sitter-sql
branch = gh-pages
18 changes: 18 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ resolver = "2"
rust-version = "1.71"

[workspace.dependencies]
tree_sitter_sql = { path = "./crates/tree_sitter_sql", version = "0.0.0" }
schema_cache = { path = "./crates/schema_cache", version = "0.0.0" }
parser = { path = "./crates/parser", version = "0.0.0" }
codegen = { path = "./crates/codegen", version = "0.0.0" }
Expand Down
3 changes: 2 additions & 1 deletion crates/schema_cache/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ mod schema_cache;
mod schemas;
mod tables;

use schema_cache::SchemaCache;
use sqlx::postgres::PgPool;

pub use schema_cache::SchemaCache;

#[derive(Debug, Clone)]
struct SchemaCacheManager {
pub cache: SchemaCache,
Expand Down
15 changes: 15 additions & 0 deletions crates/tree_sitter_sql/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
[package]
name = "tree_sitter_sql"
version = "0.0.0"
edition = "2021"

build = "build.rs"

[build-dependencies]
cc="*"

[dependencies]
tree-sitter = "0.20.10"

[lib]
doctest = false
16 changes: 16 additions & 0 deletions crates/tree_sitter_sql/build.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
fn main() {
let src_dir = std::path::Path::new("./tree-sitter-sql/src");
let mut config = cc::Build::new();
config.include(&src_dir);
config
.flag_if_supported("-Wno-unused-parameter")
.flag_if_supported("-Wno-unused-but-set-variable")
.flag_if_supported("-Wno-trigraphs");
let parser_path = src_dir.join("parser.c");
let scanner_path = src_dir.join("scanner.c");
println!("cargo:rerun-if-changed={}", parser_path.to_str().unwrap());
println!("cargo:rerun-if-changed={}", scanner_path.to_str().unwrap());
config.file(&parser_path);
config.file(&scanner_path);
config.compile("parser-scanner");
}
47 changes: 47 additions & 0 deletions crates/tree_sitter_sql/src/lib.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
use tree_sitter::Language;

extern "C" {
fn tree_sitter_sql() -> Language;
}

pub fn language() -> Language {
unsafe { tree_sitter_sql() }
}

#[cfg(test)]
mod tests {
use tree_sitter::{Query, QueryCursor};

#[test]
fn test_can_load_grammar() {
let mut parser = tree_sitter::Parser::new();
parser
.set_language(super::language())
.expect("Error loading sql language");
let source_code = "SELECT 1 FROM public.table where id = 4";

let query = Query::new(
parser.language().unwrap(),
"(
relation (
(
object_reference
schema: (identifier)
name: (identifier)
) @reference
)
)
",
)
.unwrap();

let tree = parser.parse(source_code, None).unwrap();

let mut cursor = QueryCursor::new();

let mut captures = cursor.captures(&query, tree.root_node(), source_code.as_bytes());
let (match_, idx) = captures.next().unwrap();
let capture = match_.captures[idx];
assert_eq!(capture.node.kind(), "object_reference");
}
}
1 change: 1 addition & 0 deletions crates/tree_sitter_sql/tree-sitter-sql
Submodule tree-sitter-sql added at da2d1e