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
2 changes: 1 addition & 1 deletion .github/workflows/check-upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:

- name: Create pull request
if: steps.ver.outputs.needs == 'true'
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
branch: upgrade/sqlparser-${{ steps.ver.outputs.latest }}
title: '⬆️ Upgrade to sqlparser v${{ steps.ver.outputs.latest }}'
Expand Down
6 changes: 3 additions & 3 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sqlparser-rs-wasm"
version = "0.61.1"
version = "0.62.0"
edition = "2021"
description = "WebAssembly bindings for sqlparser SQL parser"
license = "Apache-2.0"
Expand All @@ -10,7 +10,7 @@ repository = "https://github.com/guanmingchiu/sqlparser-ts"
crate-type = ["cdylib", "rlib"]

[dependencies]
sqlparser = { version = "0.61.0", features = ["serde"] }
sqlparser = { version = "0.62.0", features = ["serde"] }
wasm-bindgen = "0.2"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[![npm downloads](https://img.shields.io/npm/dm/@guanmingchiu/sqlparser-ts.svg)](https://www.npmjs.com/package/@guanmingchiu/sqlparser-ts)
[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](LICENSE)
[![WebAssembly](https://img.shields.io/badge/WebAssembly-powered-blueviolet.svg)](https://webassembly.org/)
[![sqlparser](https://img.shields.io/badge/sqlparser--rs-v0.61.0-orange.svg)](https://github.com/apache/datafusion-sqlparser-rs)
[![sqlparser](https://img.shields.io/badge/sqlparser--rs-v0.62.0-orange.svg)](https://github.com/apache/datafusion-sqlparser-rs)

SQL parser for JavaScript and TypeScript, powered by [datafusion-sqlparser-rs](https://github.com/apache/datafusion-sqlparser-rs) via WebAssembly.

Expand All @@ -16,7 +16,7 @@ SQL parser for JavaScript and TypeScript, powered by [datafusion-sqlparser-rs](h
## Features

- Parse SQL into a detailed AST with full TypeScript types
- Support 14 SQL dialects (PostgreSQL, MySQL, SQLite, BigQuery, and more)
- Support 16 SQL dialects (PostgreSQL, MySQL, SQLite, BigQuery, and more)
- Run in Node.js and browsers
- Stay small (~600KB gzipped) and fast (Rust + WebAssembly)
- Ship zero native dependencies
Expand Down Expand Up @@ -94,7 +94,7 @@ try {

## Supported Dialects

`generic`, `ansi`, `mysql`, `postgresql`, `sqlite`, `snowflake`, `redshift`, `mssql`, `clickhouse`, `bigquery`, `duckdb`, `databricks`, `hive`, `oracle`
`generic`, `ansi`, `mysql`, `postgresql`, `sqlite`, `snowflake`, `redshift`, `mssql`, `clickhouse`, `bigquery`, `duckdb`, `databricks`, `hive`, `oracle`, `spark`, `teradata`

## Versioning

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@guanmingchiu/sqlparser-ts",
"version": "0.61.1",
"version": "0.62.0",
"type": "module",
"description": "A SQL parser for JavaScript and TypeScript, powered by datafusion-sqlparser-rs via WASM",
"main": "dist/index.cjs",
Expand Down
19 changes: 19 additions & 0 deletions src/dialects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,20 @@ export class OracleDialect implements Dialect {
readonly name = 'oracle';
}

/**
* Apache Spark SQL dialect
*/
export class SparkDialect implements Dialect {
readonly name = 'spark';
}

/**
* Teradata dialect
*/
export class TeradataDialect implements Dialect {
readonly name = 'teradata';
}

/**
* All supported dialect names
*/
Expand All @@ -129,6 +143,8 @@ export const SUPPORTED_DIALECTS = [
'databricks',
'hive',
'oracle',
'spark',
'teradata',
] as const;

export type DialectName = (typeof SUPPORTED_DIALECTS)[number];
Expand All @@ -151,6 +167,8 @@ const DIALECT_MAP: Record<DialectName, new () => Dialect> = {
databricks: DatabricksDialect,
hive: HiveDialect,
oracle: OracleDialect,
spark: SparkDialect,
teradata: TeradataDialect,
};

/** Create a dialect instance from a string name (case-insensitive) */
Expand All @@ -163,6 +181,7 @@ export function dialectFromString(name: string): Dialect | undefined {
pg: 'postgresql',
sqlserver: 'mssql',
duck: 'duckdb',
sparksql: 'spark',
};

const dialectName = aliasMap[normalized] ?? normalized;
Expand Down
2 changes: 2 additions & 0 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ export {
DatabricksDialect,
HiveDialect,
OracleDialect,
SparkDialect,
TeradataDialect,
dialectFromString,
SUPPORTED_DIALECTS,
} from './dialects.js';
Expand Down
4 changes: 3 additions & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use sqlparser::ast::comments::{Comment as SqlComment, CommentWithSpan};
use sqlparser::dialect::{
AnsiDialect, BigQueryDialect, ClickHouseDialect, DatabricksDialect, Dialect, DuckDbDialect,
GenericDialect, HiveDialect, MsSqlDialect, MySqlDialect, OracleDialect, PostgreSqlDialect,
RedshiftSqlDialect, SQLiteDialect, SnowflakeDialect,
RedshiftSqlDialect, SQLiteDialect, SnowflakeDialect, SparkSqlDialect, TeradataDialect,
};
use sqlparser::parser::Parser;
use wasm_bindgen::prelude::*;
Expand Down Expand Up @@ -48,6 +48,8 @@ fn get_dialect(dialect_name: &str) -> Box<dyn Dialect> {
"databricks" => Box::new(DatabricksDialect {}),
"hive" => Box::new(HiveDialect {}),
"oracle" => Box::new(OracleDialect {}),
"spark" | "sparksql" => Box::new(SparkSqlDialect {}),
"teradata" => Box::new(TeradataDialect {}),
_ => Box::new(GenericDialect {}),
}
}
Expand Down
17 changes: 17 additions & 0 deletions tests/dialects/spark.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/**
* Spark SQL dialect tests
*/

import { parseOne, dialects } from '../test-utils';

const spark = dialects.spark;

describe('Spark SQL', () => {
test('parse_basic_select', () => {
parseOne('SELECT a, b FROM t WHERE a > 1', spark);
});

test('parse_struct_type', () => {
parseOne('CREATE TABLE t (s STRUCT<a: INT, b: STRING>)', spark);
});
});
13 changes: 13 additions & 0 deletions tests/dialects/teradata.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
/**
* Teradata dialect tests
*/

import { parseOne, dialects } from '../test-utils';

const teradata = dialects.teradata;

describe('Teradata', () => {
test('parse_basic_select', () => {
parseOne('SELECT a, b FROM t WHERE a > 1', teradata);
});
});
4 changes: 4 additions & 0 deletions tests/test-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import {
AnsiDialect,
OracleDialect,
DatabricksDialect,
SparkDialect,
TeradataDialect,
type Dialect,
type Statement,
} from '../src';
Expand Down Expand Up @@ -103,6 +105,8 @@ export const dialects = {
hive: new HiveDialect(),
oracle: new OracleDialect(),
databricks: new DatabricksDialect(),
spark: new SparkDialect(),
teradata: new TeradataDialect(),
};

/**
Expand Down
Loading