Skip to content

Commit 1aa62ee

Browse files
committed
Add tests and formatting for function keyword in condition directive
1 parent 624d806 commit 1aa62ee

File tree

4 files changed

+71
-1
lines changed

4 files changed

+71
-1
lines changed

src/test/kotlin/org/domaframework/doma/intellij/formatter/SqlFormatterTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,10 @@ class SqlFormatterTest : BasePlatformTestCase() {
258258
formatSqlFile("ComparisonOperators.sql", "ComparisonOperators$formatDataPrefix.sql")
259259
}
260260

261+
fun testFunctionKeywordInConditionDirectiveFormatter() {
262+
formatSqlFile("FunctionKeywordInConditionDirective.sql", "FunctionKeywordInConditionDirective$formatDataPrefix.sql")
263+
}
264+
261265
private fun formatSqlFile(
262266
beforeFile: String,
263267
afterFile: String,

src/test/testData/sql/formatter/ComparisonOperators_format.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ SELECT id
3535
-- Range operators
3636
date_range @> current_date AS in_range
3737
, int_range && int4range(1
38-
, 10) AS overlaps_range
38+
, 10) AS overlaps_range
3939
,
4040
-- Geometric operators
4141
point <-> point '(0,0)' AS distance_from_origin
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
-- PostgreSQL
2+
SELECT extract(YEAR FROM e.hire_date) AS hire_year FROM employees e
3+
SELECT extract(MONTH FROM e.hire_date) AS hire_month FROM employees e
4+
-- Oracle
5+
SELECT TO_DATE('2024-01-01', 'YYYY-MM-DD') AS new_year FROM dual
6+
SELECT TO_CHAR(e.hire_date, 'YYYY-MM') AS hire_month FROM employees e
7+
SELECT CURRENT_DATE FROM dual
8+
--MySQL
9+
SELECT YEAR(e.hire_date) AS hire_year FROM employees e
10+
SELECT MONTH(e.hire_date) AS hire_month FROM employees e
11+
SELECT DATE_FORMAT(e.hire_date, '%Y-%m') AS hire_month FROM employees e
12+
-- SQL Server
13+
SELECT DATEPART(YEAR, e.hire_date) AS hire_year FROM employees e
14+
SELECT DATEPART(MONTH, e.hire_date) AS hire_month FROM employees e
15+
SELECT CONVERT(VARCHAR, e.hire_date, 23) FROM employees e
16+
-- SQLite
17+
SELECT strftime('%Y', e.hire_date) AS hire_year FROM employees e
18+
SELECT strftime('%m', e.hire_date) AS hire_month FROM employees e
19+
-- Standard SQL
20+
SELECT CURRENT_TIMESTAMP FROM employees
21+
SELECT CAST(e.salary AS INTEGER) FROM employees e
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
-- PostgreSQL
2+
SELECT extract(YEAR FROM e.hire_date) AS hire_year
3+
FROM employees e
4+
SELECT extract(MONTH FROM e.hire_date) AS hire_month
5+
FROM employees e
6+
-- Oracle
7+
SELECT TO_DATE('2024-01-01'
8+
, 'YYYY-MM-DD') AS new_year
9+
FROM dual
10+
SELECT TO_CHAR(e.hire_date
11+
, 'YYYY-MM') AS hire_month
12+
FROM employees e
13+
SELECT CURRENT_DATE
14+
FROM dual
15+
--MySQL
16+
SELECT YEAR(e.hire_date) AS hire_year
17+
FROM employees e
18+
SELECT MONTH(e.hire_date) AS hire_month
19+
FROM employees e
20+
SELECT DATE_FORMAT(e.hire_date
21+
, '%Y-%m') AS hire_month
22+
FROM employees e
23+
-- SQL Server
24+
SELECT DATEPART(YEAR
25+
, e.hire_date) AS hire_year
26+
FROM employees e
27+
SELECT DATEPART(MONTH
28+
, e.hire_date) AS hire_month
29+
FROM employees e
30+
SELECT CONVERT(VARCHAR
31+
, e.hire_date
32+
, 23)
33+
FROM employees e
34+
-- SQLite
35+
SELECT strftime('%Y'
36+
, e.hire_date) AS hire_year
37+
FROM employees e
38+
SELECT strftime('%m'
39+
, e.hire_date) AS hire_month
40+
FROM employees e
41+
-- Standard SQL
42+
SELECT CURRENT_TIMESTAMP
43+
FROM employees
44+
SELECT CAST(e.salary AS INTEGER)
45+
FROM employees e

0 commit comments

Comments
 (0)