diff --git a/common/src/main/resources/META-INF/example/common/dao/ScriptDao/create.script b/common/src/main/resources/META-INF/example/common/dao/ScriptDao/create.script index a07a0027..8840d5ad 100644 --- a/common/src/main/resources/META-INF/example/common/dao/ScriptDao/create.script +++ b/common/src/main/resources/META-INF/example/common/dao/ScriptDao/create.script @@ -1,175 +1,242 @@ -create sequence employee_seq start with 100 increment by 1; - -create table department ( - id integer not null primary key, - name varchar(255) not null, - version integer not null -); - -create table employee ( - id integer not null primary key, - name varchar(255) not null, - age integer not null, - salary integer, - job_type varchar(20), - hiredate timestamp, - department_id integer, - version integer not null, - insert_timestamp timestamp, - update_timestamp timestamp -); - -create table "user" ( - id int auto_increment primary key, - name varchar(100) not null, - email varchar(255) unique not null, - created_at timestamp default current_timestamp, - version int default 0 not null -); - -create table role ( - id int auto_increment primary key, - name varchar(50) unique not null, - version int default 0 not null -); - -create table user_role ( - id int auto_increment primary key, - user_id int not null, - role_id int not null, - version int default 0 not null, - foreign key (user_id) references "user"(id), - foreign key (role_id) references role(id) -); - -create table product ( - id int auto_increment primary key, - name varchar(255) not null, - price decimal(10,2) not null, - stock_quantity int not null, - created_at timestamp default current_timestamp, - version int default 0 not null -); - -create table category ( - id int auto_increment primary key, - name varchar(100) unique not null, - version int default 0 not null -); - -create table product_category ( - id int auto_increment primary key, - product_id int not null, - category_id int not null, - version int default 0 not null, - foreign key (product_id) references product(id), - foreign key (category_id) references category(id) -); - -create table "order" ( - id int auto_increment primary key, - user_id int not null, - order_date timestamp default current_timestamp, - status varchar(50) not null, - version int default 0 not null, - foreign key (user_id) references "user"(id) -); - -create table order_item ( - id int auto_increment primary key, - order_id int not null, - product_id int not null, - quantity int not null, - price decimal(10,2) not null, - version int default 0 not null, - foreign key (order_id) references "order"(id), - foreign key (product_id) references product(id) -); - -create table payment ( - id int auto_increment primary key, - order_id int unique not null, - amount decimal(10,2) not null, - payment_date timestamp default current_timestamp, - version int default 0 not null, - foreign key (order_id) references "order"(id) -); - -create table review ( - id int auto_increment primary key, - user_id int not null, - product_id int not null, - rating int check (rating between 1 and 5), - comment text, - created_at timestamp default current_timestamp, - version int default 0 not null, - foreign key (user_id) references "user"(id), - foreign key (product_id) references product(id) -); - -insert into department (id, name, version) values - (1, 'ACCOUNTING', 1), - (2, 'RESEARCH', 1), - (3, 'SALES', 1); - -insert into employee (id, name, age, salary, job_type, hiredate, department_id, version, insert_timestamp, update_timestamp) values - (1, 'ALLEN', 30, 1600, 'SALESMAN', '2008-01-20 12:34:56', 1, 1, current_timestamp, null), - (2, 'WARD', 32, 1250, 'ANALYST', '2008-02-20 12:34:56', 2, 1, current_timestamp, null), - (3, 'JONES', 38, 2975, 'MANAGER', '2008-03-20 12:34:56', 3, 1, current_timestamp, null), - (4, 'MARTIN', 40, 1250, 'SALESMAN', '2008-04-20 12:34:56', 1, 1, current_timestamp, null), - (5, 'BLAKE', 50, 2850, 'SALESMAN', '2008-05-20 12:34:56', 2, 1, current_timestamp, null), - (6, 'CLARK', 23, 2450, 'MANAGER', '2008-06-20 12:34:56', 3, 1, current_timestamp, null), - (7, 'SCOTT', 28, 3000, 'SALESMAN', '2008-07-20 12:34:56', 1, 1, current_timestamp, null), - (8, 'KING', 38, 5000, 'CLERK', '2008-08-20 12:34:56', 2, 1, current_timestamp, null), - (9, 'TURNER', 33, 1500, 'ANALYST', '2008-09-20 12:34:56', 3, 1, current_timestamp, null), - (10, 'ADAMS', 62, 1100, 'SALESMAN', '2008-10-20 12:34:56', 1, 1, current_timestamp, null), - (11, 'JAMES', 44, 950, 'CLERK', '2008-11-20 12:34:56', 2, 1, current_timestamp, null), - (12, 'FORD', 55, 3000, 'ANALYST', '2008-12-20 12:34:56', 3, 1, current_timestamp, null), - (13, 'MILLER', 51, 1300, 'MANAGER', '2009-01-20 12:34:56', 1, 1, current_timestamp, null), - (14, 'SMITH', 410, 800, 'PRESIDENT', '2009-02-20 12:34:56', 2, 1, current_timestamp, null); - -insert into "user" (name, email, version) values - ('Alice', 'alice@example.com', 0), - ('Bob', 'bob@example.com', 0), - ('Charlie', 'charlie@example.com', 0); - -insert into role (name, version) values - ('Admin', 0), - ('User', 0); - -insert into user_role (user_id, role_id, version) values - (1, 1, 0), -- Alice is Admin - (2, 2, 0), -- Bob is User - (3, 2, 0); -- Charlie is User - -insert into product (name, price, stock_quantity, version) values - ('Laptop', 1200.99, 10, 0), - ('Smartphone', 699.49, 20, 0), - ('Tablet', 399.99, 15, 0); - -insert into category (name, version) values - ('Electronics', 0), - ('Gadgets', 0); - -insert into product_category (product_id, category_id, version) values - (1, 1, 0), -- Laptop -> Electronics - (2, 1, 0), -- Smartphone -> Electronics - (2, 2, 0), -- Smartphone -> Gadgets - (3, 2, 0); -- Tablet -> Gadgets - -insert into "order" (user_id, status, version) values - (1, 'Pending', 0), - (2, 'Shipped', 0); - -insert into order_item (order_id, product_id, quantity, price, version) values - (1, 1, 1, 1200.99, 0), -- Alice orders 1 Laptop - (2, 2, 2, 699.49, 0); -- Bob orders 2 Smartphones - -insert into payment (order_id, amount, version) values - (1, 1200.99, 0), - (2, 1398.98, 0); - -insert into review (user_id, product_id, rating, comment, version) values - (1, 1, 5, 'Great laptop!', 0), - (2, 2, 4, 'Good phone, but battery life could be better.', 0), - (3, 3, 3, 'Tablet is decent for the price.', 0); +CREATE sequence employee_seq start +WITH 100 increment BY 1 ; +CREATE TABLE department + ( + id integer NOT NULL PRIMARY KEY + , name varchar(255) NOT NULL + , version integer NOT NULL + ) ; +CREATE TABLE employee + ( + id integer NOT NULL PRIMARY KEY + , name varchar(255) NOT NULL + , age integer NOT NULL + , salary integer + , job_type varchar(20) + , hiredate timestamp + , department_id integer + , version integer NOT NULL + , insert_timestamp timestamp + , update_timestamp timestamp + ) ; +CREATE TABLE "user" + ( + id int auto_increment PRIMARY KEY + , name varchar(100) NOT NULL + , email varchar(255) UNIQUE NOT NULL + , created_at timestamp DEFAULT current_timestamp + , version int DEFAULT 0 NOT NULL + ) ; +CREATE TABLE role + ( + id int auto_increment PRIMARY KEY + , name varchar(50) UNIQUE NOT NULL + , version int DEFAULT 0 NOT NULL + ) ; +CREATE TABLE user_role + ( + id int auto_increment PRIMARY KEY + , user_id int NOT NULL + , role_id int NOT NULL + , version int DEFAULT 0 NOT NULL + , FOREIGN KEY(user_id) REFERENCES "user" (id) + , FOREIGN KEY(role_id) REFERENCES role(id) + ) ; +CREATE TABLE product + ( + id int auto_increment PRIMARY KEY + , name varchar(255) NOT NULL + , price decimal(10 , 2) NOT NULL + , stock_quantity int NOT NULL + , created_at timestamp DEFAULT current_timestamp + , version int DEFAULT 0 NOT NULL + ) ; +CREATE TABLE category + ( + id int auto_increment PRIMARY KEY + , name varchar(100) UNIQUE NOT NULL + , version int DEFAULT 0 NOT NULL + ) ; +CREATE TABLE product_category + ( + id int auto_increment PRIMARY KEY + , product_id int NOT NULL + , category_id int NOT NULL + , version int DEFAULT 0 NOT NULL + , FOREIGN KEY(product_id) REFERENCES product(id) + , FOREIGN KEY(category_id) REFERENCES category(id) + ) ; +CREATE TABLE "order" + ( + id int auto_increment PRIMARY KEY + , user_id int NOT NULL + , order_date timestamp DEFAULT current_timestamp + , status varchar(50) NOT NULL + , version int DEFAULT 0 NOT NULL + , FOREIGN KEY(user_id) REFERENCES "user" (id) + ) ; +CREATE TABLE order_item + ( + id int auto_increment PRIMARY KEY + , order_id int NOT NULL + , product_id int NOT NULL + , quantity int NOT NULL + , price decimal(10 , 2) NOT NULL + , version int DEFAULT 0 NOT NULL + , FOREIGN KEY(order_id) REFERENCES "order" (id) + , FOREIGN KEY(product_id) REFERENCES product(id) + ) ; +CREATE TABLE payment + ( + id int auto_increment PRIMARY KEY + , order_id int UNIQUE NOT NULL + , amount decimal(10 , 2) NOT NULL + , payment_date timestamp DEFAULT current_timestamp + , version int DEFAULT 0 NOT NULL + , FOREIGN KEY(order_id) REFERENCES "order" (id) + ) ; +CREATE TABLE review + ( + id int auto_increment PRIMARY KEY + , user_id int NOT NULL + , product_id int NOT NULL + , rating int CHECK(rating BETWEEN 1 AND 5) + , COMMENT text + , created_at timestamp DEFAULT current_timestamp + , version int DEFAULT 0 NOT NULL + , FOREIGN KEY(user_id) REFERENCES "user" (id) + , FOREIGN KEY(product_id) REFERENCES product(id) + ) ; + INSERT INTO department + (id + , name + , version) + VALUES ( 1 + , 'ACCOUNTING' + , 1 ) + , (2, 'RESEARCH', 1) + , (3, 'SALES', 1) ; INSERT INTO employee + (id + , name + , age + , salary + , job_type + , hiredate + , department_id + , version + , insert_timestamp + , update_timestamp) + VALUES ( 1 + , 'ALLEN' + , 30 + , 1600 + , 'SALESMAN' + , '2008-01-20 12:34:56' + , 1 + , 1 + , current_timestamp + , NULL ) + , (2, 'WARD', 32, 1250, 'ANALYST', '2008-02-20 12:34:56', 2, 1, current_timestamp, NULL) + , (3, 'JONES', 38, 2975, 'MANAGER', '2008-03-20 12:34:56', 3, 1, current_timestamp, NULL) + , (4, 'MARTIN', 40, 1250, 'SALESMAN', '2008-04-20 12:34:56', 1, 1, current_timestamp, NULL) + , (5, 'BLAKE', 50, 2850, 'SALESMAN', '2008-05-20 12:34:56', 2, 1, current_timestamp, NULL) + , (6, 'CLARK', 23, 2450, 'MANAGER', '2008-06-20 12:34:56', 3, 1, current_timestamp, NULL) + , (7, 'SCOTT', 28, 3000, 'SALESMAN', '2008-07-20 12:34:56', 1, 1, current_timestamp, NULL) + , (8, 'KING', 38, 5000, 'CLERK', '2008-08-20 12:34:56', 2, 1, current_timestamp, NULL) + , (9, 'TURNER', 33, 1500, 'ANALYST', '2008-09-20 12:34:56', 3, 1, current_timestamp, NULL) + , (10, 'ADAMS', 62, 1100, 'SALESMAN', '2008-10-20 12:34:56', 1, 1, current_timestamp, NULL) + , (11, 'JAMES', 44, 950, 'CLERK', '2008-11-20 12:34:56', 2, 1, current_timestamp, NULL) + , (12, 'FORD', 55, 3000, 'ANALYST', '2008-12-20 12:34:56', 3, 1, current_timestamp, NULL) + , (13, 'MILLER', 51, 1300, 'MANAGER', '2009-01-20 12:34:56', 1, 1, current_timestamp, NULL) + , (14, 'SMITH', 410, 800, 'PRESIDENT', '2009-02-20 12:34:56', 2, 1, current_timestamp, NULL) ; INSERT INTO "user" + (name + , email + , version) + VALUES ( 'Alice' + , 'alice@example.com' + , 0 ) + , ('Bob', 'bob@example.com', 0) + , ('Charlie', 'charlie@example.com', 0) ; INSERT INTO role + (name + , version) + VALUES ( 'Admin' + , 0 ) + , ('User', 0) ; INSERT INTO user_role + (user_id + , role_id + , version) + VALUES ( 1 + , 1 + , 0 ) + , -- Alice is Admin + (2, 2, 0) + , -- Bob is User + (3, 2, 0) ; -- Charlie is User + INSERT INTO product + (name + , price + , stock_quantity + , version) + VALUES ( 'Laptop' + , 1200.99 + , 10 + , 0 ) + , ('Smartphone', 699.49, 20, 0) + , ('Tablet', 399.99, 15, 0) ; INSERT INTO category + (name + , version) + VALUES ( 'Electronics' + , 0 ) + , ('Gadgets', 0) ; INSERT INTO product_category + (product_id + , category_id + , version) + VALUES ( 1 + , 1 + , 0 ) + , -- Laptop -> Electronics + (2, 1, 0) + , -- Smartphone -> Electronics + (2, 2, 0) + , -- Smartphone -> Gadgets + (3, 2, 0) ; -- Tablet -> Gadgets + INSERT INTO "order" + (user_id + , status + , version) + VALUES ( 1 + , 'Pending' + , 0 ) + , (2, 'Shipped', 0) ; INSERT INTO order_item + (order_id + , product_id + , quantity + , price + , version) + VALUES ( 1 + , 1 + , 1 + , 1200.99 + , 0 ) + , -- Alice orders 1 Laptop + (2, 2, 2, 699.49, 0) ; -- Bob orders 2 Smartphones + INSERT INTO payment + (order_id + , amount + , version) + VALUES ( 1 + , 1200.99 + , 0 ) + , (2, 1398.98, 0) ; INSERT INTO review + (user_id + , product_id + , rating + , COMMENT + , version) + VALUES ( 1 + , 1 + , 5 + , 'Great laptop!' + , 0 ) + , (2, 2, 4, 'Good phone, but battery life could be better.', 0) + , (3, 3, 3, 'Tablet is decent for the price.', 0) ; diff --git a/common/src/main/resources/META-INF/example/common/dao/ScriptDao/drop.script b/common/src/main/resources/META-INF/example/common/dao/ScriptDao/drop.script index 1a3bf4ab..9d22e661 100644 --- a/common/src/main/resources/META-INF/example/common/dao/ScriptDao/drop.script +++ b/common/src/main/resources/META-INF/example/common/dao/ScriptDao/drop.script @@ -1,14 +1,13 @@ -drop sequence employee_seq; -drop table employee; -drop table department; - -drop table if exists review; -drop table if exists payment; -drop table if exists order_item; -drop table if exists "order"; -drop table if exists product_category; -drop table if exists category; -drop table if exists product; -drop table if exists user_role; -drop table if exists role; -drop table if exists "user"; + DROP sequence employee_seq ; + DROP TABLE employee ; + DROP TABLE department ; + DROP TABLE IF EXISTS review ; + DROP TABLE IF EXISTS payment ; + DROP TABLE IF EXISTS order_item ; + DROP TABLE IF EXISTS "order" ; + DROP TABLE IF EXISTS product_category ; + DROP TABLE IF EXISTS category ; + DROP TABLE IF EXISTS product ; + DROP TABLE IF EXISTS user_role ; + DROP TABLE IF EXISTS role ; + DROP TABLE IF EXISTS "user" ; diff --git a/example-geometric-type/src/main/java/example/geometric/type/dao/CircleZoneDao.java b/example-geometric-type/src/main/java/example/geometric/type/dao/CircleZoneDao.java index 115ca97f..68121eda 100644 --- a/example-geometric-type/src/main/java/example/geometric/type/dao/CircleZoneDao.java +++ b/example-geometric-type/src/main/java/example/geometric/type/dao/CircleZoneDao.java @@ -9,7 +9,12 @@ @Dao public interface CircleZoneDao { - @Sql("select /*%expand */* from circle_zone where id = /* id */0") + @Sql( + """ + SELECT /*%expand */* + FROM circle_zone + WHERE id = /* id */0 + """) @Select CircleZone selectById(Integer id); diff --git a/example-geometric-type/src/main/java/example/geometric/type/dao/LandmarkDao.java b/example-geometric-type/src/main/java/example/geometric/type/dao/LandmarkDao.java index 5ec7b3a3..4b597027 100644 --- a/example-geometric-type/src/main/java/example/geometric/type/dao/LandmarkDao.java +++ b/example-geometric-type/src/main/java/example/geometric/type/dao/LandmarkDao.java @@ -9,7 +9,12 @@ @Dao public interface LandmarkDao { - @Sql("select /*%expand */* from landmark where id = /* id */0") + @Sql( + """ + SELECT /*%expand */* + FROM landmark + WHERE id = /* id */0 + """) @Select Landmark selectById(Integer id); diff --git a/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/create.script b/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/create.script index 86253b6d..5accac5a 100644 --- a/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/create.script +++ b/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/create.script @@ -1,11 +1,12 @@ -CREATE TABLE landmark ( - id INTEGER PRIMARY KEY, - name TEXT NOT NULL, - location POINT NOT NULL -); - -CREATE TABLE circle_zone ( - id INTEGER PRIMARY KEY, - name TEXT NOT NULL, - boundary CIRCLE NOT NULL -); \ No newline at end of file +CREATE TABLE landmark + ( + id INTEGER PRIMARY KEY + , name TEXT NOT NULL + , location POINT NOT NULL + ) ; +CREATE TABLE circle_zone + ( + id INTEGER PRIMARY KEY + , name TEXT NOT NULL + , boundary CIRCLE NOT NULL + ) ; diff --git a/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/drop.script b/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/drop.script index d4fe213c..fae60f5c 100644 --- a/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/drop.script +++ b/example-geometric-type/src/main/resources/META-INF/example/geometric/type/dao/ScriptDao/drop.script @@ -1,2 +1,2 @@ -DROP TABLE landmark; -DROP TABLE circle_zone; + DROP TABLE landmark ; + DROP TABLE circle_zone ; diff --git a/example-jpms/src/main/java/example/jpms/dao/EmployeeDao.java b/example-jpms/src/main/java/example/jpms/dao/EmployeeDao.java index eb1a7087..e6958040 100644 --- a/example-jpms/src/main/java/example/jpms/dao/EmployeeDao.java +++ b/example-jpms/src/main/java/example/jpms/dao/EmployeeDao.java @@ -10,13 +10,10 @@ public interface EmployeeDao { @Sql( """ - select - /*%expand*/* - from - employee - where - id = /* id */0 - """) + SELECT /*%expand*/* + FROM employee + WHERE id = /* id */0 + """) @Select Employee selectById(Integer id); } diff --git a/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/create.script b/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/create.script index e0427f99..55c7b2bc 100644 --- a/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/create.script +++ b/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/create.script @@ -1,20 +1,185 @@ -create sequence employee_seq start with 100 increment by 1; -create table department (id integer not null primary key,name varchar(255) not null, version integer not null); -create table employee (id integer not null primary key,name varchar(255) not null,age integer not null,salary integer,job_type varchar(20),hiredate timestamp, department_id integer, version integer not null, insertTimestamp timestamp, updateTimestamp timestamp); -insert into department values(1,'ACCOUNTING',1); -insert into department values(2,'RESEARCH',1); -insert into department values(3,'SALES',1); -insert into employee values(1,'ALLEN',30,1600,'SALESMAN','2008-01-20 12:34:56',1,1,CURRENT_TIMESTAMP,null); -insert into employee values(2,'WARD',32,1250,'ANALYST','2008-02-20 12:34:56',2,1,CURRENT_TIMESTAMP,null); -insert into employee values(3,'JONES',38,2975,'MANAGER','2008-03-20 12:34:56',3,1,CURRENT_TIMESTAMP,null); -insert into employee values(4,'MARTIN',40,1250,'SALESMAN','2008-04-20 12:34:56',1,1,CURRENT_TIMESTAMP,null); -insert into employee values(5,'BLAKE',50,2850,'SALESMAN','2008-05-20 12:34:56',2,1,CURRENT_TIMESTAMP,null); -insert into employee values(6,'CLARK',23,2450,'MANAGER','2008-06-20 12:34:56',3,1,CURRENT_TIMESTAMP,null); -insert into employee values(7,'SCOTT',28,3000,'SALESMAN','2008-07-20 12:34:56',1,1,CURRENT_TIMESTAMP,null); -insert into employee values(8,'KING',38,5000,'CLERK','2008-08-20 12:34:56',2,1,CURRENT_TIMESTAMP,null); -insert into employee values(9,'TURNER',33,1500,'ANALYST','2008-09-20 12:34:56',3,1,CURRENT_TIMESTAMP,null); -insert into employee values(10,'ADAMS',62,1100,'SALESMAN','2008-10-20 12:34:56',1,1,CURRENT_TIMESTAMP,null); -insert into employee values(11,'JAMES',44,950,'CLERK','2008-11-20 12:34:56',2,1,CURRENT_TIMESTAMP,null); -insert into employee values(12,'FORD',55,3000,'ANALYST','2008-12-20 12:34:56',3,1,CURRENT_TIMESTAMP,null); -insert into employee values(13,'MILLER',51,1300,'MANAGER','2009-01-20 12:34:56',1,1,CURRENT_TIMESTAMP,null); -insert into employee values(14,'SMITH',410,800,'PRESIDENT','2009-02-20 12:34:56',2,1,CURRENT_TIMESTAMP,null); +CREATE sequence employee_seq start +WITH 100 increment BY 1 ; +CREATE TABLE department + ( id integer NOT NULL PRIMARY KEY + , name varchar(255) NOT NULL + , version integer NOT NULL + ) ; +CREATE TABLE employee + ( id integer NOT NULL PRIMARY KEY + , name varchar(255) NOT NULL + , age integer NOT NULL + , salary integer + , job_type varchar(20) + , hiredate timestamp + , department_id integer + , version integer NOT NULL + , insertTimestamp timestamp + , updateTimestamp timestamp + ) ; + INSERT INTO department + VALUES ( 1 + , 'ACCOUNTING' + , 1 ) ; + INSERT INTO department + VALUES ( 2 + , 'RESEARCH' + , 1 ) ; + INSERT INTO department + VALUES ( 3 + , 'SALES' + , 1 ) ; + INSERT INTO employee + VALUES ( 1 + , 'ALLEN' + , 30 + , 1600 + , 'SALESMAN' + , '2008-01-20 12:34:56' + , 1 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 2 + , 'WARD' + , 32 + , 1250 + , 'ANALYST' + , '2008-02-20 12:34:56' + , 2 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 3 + , 'JONES' + , 38 + , 2975 + , 'MANAGER' + , '2008-03-20 12:34:56' + , 3 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 4 + , 'MARTIN' + , 40 + , 1250 + , 'SALESMAN' + , '2008-04-20 12:34:56' + , 1 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 5 + , 'BLAKE' + , 50 + , 2850 + , 'SALESMAN' + , '2008-05-20 12:34:56' + , 2 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 6 + , 'CLARK' + , 23 + , 2450 + , 'MANAGER' + , '2008-06-20 12:34:56' + , 3 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 7 + , 'SCOTT' + , 28 + , 3000 + , 'SALESMAN' + , '2008-07-20 12:34:56' + , 1 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 8 + , 'KING' + , 38 + , 5000 + , 'CLERK' + , '2008-08-20 12:34:56' + , 2 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 9 + , 'TURNER' + , 33 + , 1500 + , 'ANALYST' + , '2008-09-20 12:34:56' + , 3 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 10 + , 'ADAMS' + , 62 + , 1100 + , 'SALESMAN' + , '2008-10-20 12:34:56' + , 1 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 11 + , 'JAMES' + , 44 + , 950 + , 'CLERK' + , '2008-11-20 12:34:56' + , 2 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 12 + , 'FORD' + , 55 + , 3000 + , 'ANALYST' + , '2008-12-20 12:34:56' + , 3 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 13 + , 'MILLER' + , 51 + , 1300 + , 'MANAGER' + , '2009-01-20 12:34:56' + , 1 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; + INSERT INTO employee + VALUES ( 14 + , 'SMITH' + , 410 + , 800 + , 'PRESIDENT' + , '2009-02-20 12:34:56' + , 2 + , 1 + , CURRENT_TIMESTAMP + , NULL ) ; diff --git a/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/drop.script b/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/drop.script index 87f8d3a2..fea95295 100644 --- a/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/drop.script +++ b/example-jpms/src/main/resources/META-INF/example/jpms/dao/ScriptDao/drop.script @@ -1,3 +1,3 @@ -drop sequence employee_seq; -drop table employee; -drop table department; + DROP sequence employee_seq ; + DROP TABLE employee ; + DROP TABLE department ; diff --git a/example-jpms/src/main/resources/logback.xml b/example-jpms/src/main/resources/logback.xml index b9f60d32..2b10d6c9 100644 --- a/example-jpms/src/main/resources/logback.xml +++ b/example-jpms/src/main/resources/logback.xml @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/example-sql-annotation/src/main/java/example/sql/annotation/EmployeeDao.java b/example-sql-annotation/src/main/java/example/sql/annotation/EmployeeDao.java index 70fd1b54..0e658d38 100644 --- a/example-sql-annotation/src/main/java/example/sql/annotation/EmployeeDao.java +++ b/example-sql-annotation/src/main/java/example/sql/annotation/EmployeeDao.java @@ -25,229 +25,229 @@ public interface EmployeeDao { @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE id = /* id */0 - """) + SELECT /*%expand*/* + FROM employee + WHERE id = /* id */0 + """) @Select Employee selectById(Integer id); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE - /*%if min != null */ - age >= /* min */10 - /*%end */ - /*%if max != null */ - AND age <= /* max */70 - /*%end */ - ORDER BY age - """) + SELECT /*%expand*/* + FROM employee + WHERE + /*%if min != null */ + age >= /* min */10 + /*%end */ + /*%if max != null */ + AND age <= /* max */70 + /*%end */ + ORDER BY age + """) @Select List selectByAgeRange(Age min, Age max); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE - /*%for age : ages */ - age = /* age */30 - /*%if age_has_next */ - /*# "or" */ - /*%end */ - /*%end */ - """) + SELECT /*%expand*/* + FROM employee + WHERE + /*%for age : ages */ + age = /* age */30 + /*%if age_has_next */ + /*# "or" */ + /*%end */ + /*%end */ + """) @Select List selectByAges(List ages); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE - /*%if name != null*/ - name = /* name */'hoge' - /*%else */ - AND name IS NULL - /*%end */ - """) + SELECT /*%expand*/* + FROM employee + WHERE + /*%if name != null*/ + name = /* name */'hoge' + /*%else */ + AND name IS NULL + /*%end */ + """) @Select List selectByName(String name); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE name IN /* names */('aaa', 'bbb') - """) + SELECT /*%expand*/* + FROM employee + WHERE name IN /* names */('aaa', 'bbb') + """) @Select List selectByNames(List names); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE - /*%if @isNotEmpty(name) */ - name = /* name */'hoge' - /*%end*/ - """) + SELECT /*%expand*/* + FROM employee + WHERE + /*%if @isNotEmpty(name) */ + name = /* name */'hoge' + /*%end*/ + """) @Select List selectByNotEmptyName(String name); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE name LIKE /* @prefix(prefix) */'X%' escape '$' - """) + SELECT /*%expand*/* + FROM employee + WHERE name LIKE /* @prefix(prefix) */'X%' escape '$' + """) @Select List selectByNameWithPrefixMatching(String prefix); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE name LIKE /* @suffix(suffix) */'%X' escape '$' - """) + SELECT /*%expand*/* + FROM employee + WHERE name LIKE /* @suffix(suffix) */'%X' escape '$' + """) @Select List selectByNameWithSuffixMatching(String suffix); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE name LIKE /* @infix(inside) */'%X%' escape '$' - """) + SELECT /*%expand*/* + FROM employee + WHERE name LIKE /* @infix(inside) */'%X%' escape '$' + """) @Select List selectByNameWithInfixMatching(String inside); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE hiredate >= /* @roundDownTimePart(from) */'2001-01-01 12:34:56' - AND hiredate < /* @roundUpTimePart(to) */'2001-01-01 12:34:56' - """) + SELECT /*%expand*/* + FROM employee + WHERE hiredate >= /* @roundDownTimePart(from) */'2001-01-01 12:34:56' + AND hiredate < /* @roundUpTimePart(to) */'2001-01-01 12:34:56' + """) @Select List selectByHiredateRange(Timestamp from, Timestamp to); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE salary > /* salary */0 - """) + SELECT /*%expand*/* + FROM employee + WHERE salary > /* salary */0 + """) @Select List selectBySalary(Salary salary); @Sql( """ - SELECT sum(salary) - FROM employee - """) + SELECT sum(salary) + FROM employee + """) @Select Salary selectSummedSalary(); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE name = /* e.name */'aaa' - """) + SELECT /*%expand*/* + FROM employee + WHERE name = /* e.name */'aaa' + """) @Select List selectByExample(Employee e); @Sql( """ - SELECT /*%expand*/* - FROM employee - ORDER BY id - """) + SELECT /*%expand*/* + FROM employee + ORDER BY id + """) @Select List selectAll(); @Sql( """ - SELECT /*%expand*/* - FROM employee - ORDER BY id - """) + SELECT /*%expand*/* + FROM employee + ORDER BY id + """) @Select List selectAll(SelectOptions options); @Sql( """ - SELECT /*%expand*/* - FROM employee - WHERE age > /* age */0 - ORDER BY age - """) + SELECT /*%expand*/* + FROM employee + WHERE age > /* age */0 + ORDER BY age + """) @Select(strategy = SelectType.STREAM) R selectByAge(int age, Function, R> mapper); @Sql( """ - SELECT /*%expand */* - FROM employee e - LEFT OUTER JOIN department d - ON e.department_id = d.id - ORDER BY e.id - """) + SELECT /*%expand */* + FROM employee e + LEFT OUTER JOIN department d + ON e.department_id = d.id + ORDER BY e.id + """) @Select(aggregateStrategy = EmployeeAggregateStrategy.class) List selectAllEmployeeDepartment(); @Sql( """ - INSERT INTO Employee - (ID - , NAME - , AGE - , DEPARTMENT_ID - , HIREDATE - , JOB_TYPE - , SALARY - , INSERT_TIMESTAMP - , UPDATE_TIMESTAMP - , VERSION) - VALUES ( /* employee.id */1 - , /* employee.name */'test' - , /* employee.age */10 - , /* employee.departmentId */1 - , /* employee.hiredate */'2010-01-01' - , /* employee.jobType */'SALESMAN' - , /* employee.salary */300 - , /* employee.insertTimestamp */'2010-01-01 12:34:56' - , /* employee.updateTimestamp */'2010-01-01 12:34:56' - , /* employee.version */1 ) - """) + INSERT INTO Employee + (ID + , NAME + , AGE + , DEPARTMENT_ID + , HIREDATE + , JOB_TYPE + , SALARY + , INSERT_TIMESTAMP + , UPDATE_TIMESTAMP + , VERSION) + VALUES ( /* employee.id */1 + , /* employee.name */'test' + , /* employee.age */10 + , /* employee.departmentId */1 + , /* employee.hiredate */'2010-01-01' + , /* employee.jobType */'SALESMAN' + , /* employee.salary */300 + , /* employee.insertTimestamp */'2010-01-01 12:34:56' + , /* employee.updateTimestamp */'2010-01-01 12:34:56' + , /* employee.version */1 ) + """) @Insert int insert(Employee employee); @Sql( """ - UPDATE Employee - SET NAME = /* employee.name */'test' - , AGE = /* employee.age */10 - , DEPARTMENT_ID = /* employee.departmentId */1 - , HIREDATE = /* employee.hiredate */'2010-01-01' - , JOB_TYPE = /* employee.jobType */'SALESMAN' - , SALARY = /* employee.salary */300 - , UPDATE_TIMESTAMP = /* employee.updateTimestamp */'2010-01-01 12:34:56' - , VERSION = /* employee.version */1 - WHERE ID = /* employee.id */1 - """) + UPDATE Employee + SET NAME = /* employee.name */'test' + , AGE = /* employee.age */10 + , DEPARTMENT_ID = /* employee.departmentId */1 + , HIREDATE = /* employee.hiredate */'2010-01-01' + , JOB_TYPE = /* employee.jobType */'SALESMAN' + , SALARY = /* employee.salary */300 + , UPDATE_TIMESTAMP = /* employee.updateTimestamp */'2010-01-01 12:34:56' + , VERSION = /* employee.version */1 + WHERE ID = /* employee.id */1 + """) @Update int update(Employee employee); @Sql( """ - DELETE FROM Employee - WHERE ID = /* employee.id */0 - """) + DELETE FROM Employee + WHERE ID = /* employee.id */0 + """) @Delete int delete(Employee employee); } diff --git a/example-sql-annotation/src/main/java/example/sql/annotation/OrderDao.java b/example-sql-annotation/src/main/java/example/sql/annotation/OrderDao.java index 97180e04..5f4b78ca 100644 --- a/example-sql-annotation/src/main/java/example/sql/annotation/OrderDao.java +++ b/example-sql-annotation/src/main/java/example/sql/annotation/OrderDao.java @@ -18,16 +18,22 @@ public interface OrderDao { @Sql( """ - select /*%expand */* - from "order" o - left outer join payment pa on o.id = pa.order_id - left outer join "user" u on o.user_id = u.id - left outer join order_item oi on o.id = oi.order_id - left outer join product pr on oi.product_id = pr.id - left outer join product_category pc on pr.id = pc.product_id - left outer join category c on pc.category_id = c.id - where o.id = /* id */0 - """) + SELECT /*%expand */* + FROM "order" o + LEFT OUTER JOIN payment pa + ON o.id = pa.order_id + LEFT OUTER JOIN "user" u + ON o.user_id = u.id + LEFT OUTER JOIN order_item oi + ON o.id = oi.order_id + LEFT OUTER JOIN product pr + ON oi.product_id = pr.id + LEFT OUTER JOIN product_category pc + ON pr.id = pc.product_id + LEFT OUTER JOIN category c + ON pc.category_id = c.id + WHERE o.id = /* id */0 + """) @Select(aggregateStrategy = OrderAggregateStrategy.class) Order selectById(Integer id); } diff --git a/example-sql-annotation/src/main/java/example/sql/annotation/ReviewDao.java b/example-sql-annotation/src/main/java/example/sql/annotation/ReviewDao.java index 287d977a..130c9c44 100644 --- a/example-sql-annotation/src/main/java/example/sql/annotation/ReviewDao.java +++ b/example-sql-annotation/src/main/java/example/sql/annotation/ReviewDao.java @@ -15,12 +15,14 @@ public interface ReviewDao { @Sql( """ - select /*%expand */* - from review r - left outer join product pr on r.product_id = pr.id - left outer join "user" u on r.user_id = u.id - order by r.id - """) + SELECT /*%expand */* + FROM review r + LEFT OUTER JOIN product pr + ON r.product_id = pr.id + LEFT OUTER JOIN "user" u + ON r.user_id = u.id + ORDER BY r.id + """) @Select(aggregateStrategy = ReviewAggregateStrategy.class) List selectAll(); } diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/delete.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/delete.sql index 940c982d..4ca4296d 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/delete.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/delete.sql @@ -1,5 +1,2 @@ -delete -from - Employee -where - ID = /* employee.id */0 +DELETE FROM Employee + WHERE ID = /* employee.id */0 diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/insert.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/insert.sql index 873427a8..1959ab19 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/insert.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/insert.sql @@ -1,23 +1,21 @@ -insert into Employee ( - ID, - NAME, - AGE, - DEPARTMENT_ID, - HIREDATE, - JOB_TYPE, - SALARY, - INSERT_TIMESTAMP, - UPDATE_TIMESTAMP, - VERSION -) values ( - /* employee.id */1, - /* employee.name　*/'test', - /* employee.age */10, - /* employee.departmentId */1, - /* employee.hiredate */'2010-01-01', - /* employee.jobType */'SALESMAN', - /* employee.salary */300, - /* employee.insertTimestamp */'2010-01-01 12:34:56', - /* employee.updateTimestamp */'2010-01-01 12:34:56', - /* employee.version */1 -) +INSERT INTO Employee + (ID + , NAME + , AGE + , DEPARTMENT_ID + , HIREDATE + , JOB_TYPE + , SALARY + , INSERT_TIMESTAMP + , UPDATE_TIMESTAMP + , VERSION) + VALUES ( /* employee.id */1 + , /* employee.name */'test' + , /* employee.age */10 + , /* employee.departmentId */1 + , /* employee.hiredate */'2010-01-01' + , /* employee.jobType */'SALESMAN' + , /* employee.salary */300 + , /* employee.insertTimestamp */'2010-01-01 12:34:56' + , /* employee.updateTimestamp */'2010-01-01 12:34:56' + , /* employee.version */1 ) diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAll.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAll.sql index e2cfa2c4..b333af0f 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAll.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAll.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -order by - id +SELECT /*%expand*/* + FROM employee + ORDER BY id diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAllEmployeeDepartment.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAllEmployeeDepartment.sql index b82fab08..0a149f6d 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAllEmployeeDepartment.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectAllEmployeeDepartment.sql @@ -1,10 +1,5 @@ -select - /*%expand */* -from - employee e -left outer join - department d - on - e.department_id = d.id -order by - e.id +SELECT /*%expand */* + FROM employee e + LEFT OUTER JOIN department d + ON e.department_id = d.id + ORDER BY e.id diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAge.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAge.sql index 2b733869..889bc117 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAge.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAge.sql @@ -1,8 +1,4 @@ -select - /*%expand*/* -from - employee -where - age > /* age */0 -order by - age +SELECT /*%expand*/* + FROM employee + WHERE age > /* age */0 + ORDER BY age diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAgeRange.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAgeRange.sql index 26aca2ac..e30f1295 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAgeRange.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAgeRange.sql @@ -1,14 +1,10 @@ -select - /*%expand*/* -from - employee -where - /*%if min != null */ - age >= /* min */10 - /*%end */ - /*%if max != null */ - and - age <= /* max */70 - /*%end */ -order by - age +SELECT /*%expand*/* + FROM employee + WHERE + /*%if min != null */ + age >= /* min */10 + /*%end */ + /*%if max != null */ + AND age <= /* max */70 + /*%end */ + ORDER BY age diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAges.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAges.sql index 54829e3c..883db76c 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAges.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByAges.sql @@ -1,11 +1,9 @@ -select - /*%expand*/* -from - employee -where - /*%for age : ages */ - age = /* age */30 - /*%if age_has_next */ - /*# "or" */ - /*%end */ - /*%end */ +SELECT /*%expand*/* + FROM employee + WHERE + /*%for age : ages */ + age = /* age */30 + /*%if age_has_next */ + /*# "or" */ + /*%end */ + /*%end */ diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByExample.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByExample.sql index 73400519..3f6a583f 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByExample.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByExample.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - name = /* e.name */'aaa' +SELECT /*%expand*/* + FROM employee + WHERE name = /* e.name */'aaa' diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByHiredateRange.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByHiredateRange.sql index 722c3559..ec9743f0 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByHiredateRange.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByHiredateRange.sql @@ -1,8 +1,4 @@ -select - /*%expand*/* -from - employee -where - hiredate >= /* @roundDownTimePart(from) */'2001-01-01 12:34:56' - and - hiredate < /* @roundUpTimePart(to) */'2001-01-01 12:34:56' +SELECT /*%expand*/* + FROM employee + WHERE hiredate >= /* @roundDownTimePart(from) */'2001-01-01 12:34:56' + AND hiredate < /* @roundUpTimePart(to) */'2001-01-01 12:34:56' diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectById.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectById.sql index 7267b2c9..8668177c 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectById.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectById.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - id = /* id */0 +SELECT /*%expand*/* + FROM employee + WHERE id = /* id */0 diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByName.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByName.sql index 12628870..2c55002d 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByName.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByName.sql @@ -1,11 +1,8 @@ -select - /*%expand*/* -from - employee -where - /*%if name != null*/ - name = /*name*/'hoge' - /*%else */ -and - name is null -/*%end */ +SELECT /*%expand*/* + FROM employee + WHERE + /*%if name != null*/ + name = /* name */'hoge' + /*%else */ + AND name IS NULL + /*%end */ diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithInfixMatching.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithInfixMatching.sql index 7f754f09..1372b8f4 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithInfixMatching.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithInfixMatching.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - name like /* @infix(inside) */'%X%' escape '$' +SELECT /*%expand*/* + FROM employee + WHERE name LIKE /* @infix(inside) */'%X%' escape '$' diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithPrefixMatching.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithPrefixMatching.sql index 2ba1bb38..db8661a1 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithPrefixMatching.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithPrefixMatching.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - name like /* @prefix(prefix) */'X%' escape '$' +SELECT /*%expand*/* + FROM employee + WHERE name LIKE /* @prefix(prefix) */'X%' escape '$' diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithSuffixMatching.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithSuffixMatching.sql index 98ec37cb..5b4197d3 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithSuffixMatching.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNameWithSuffixMatching.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - name like /* @suffix(suffix) */'%X' escape '$' +SELECT /*%expand*/* + FROM employee + WHERE name LIKE /* @suffix(suffix) */'%X' escape '$' diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNames.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNames.sql index 225ef909..468b8b6f 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNames.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNames.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - name in /* names */('aaa', 'bbb') +SELECT /*%expand*/* + FROM employee + WHERE name IN /* names */('aaa', 'bbb') diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNotEmptyName.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNotEmptyName.sql index e4829c83..6b6ff832 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNotEmptyName.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectByNotEmptyName.sql @@ -1,6 +1,6 @@ -select - /*%expand*/* -from - employee -where - /*%if @isNotEmpty(name) */ name = /* name */'hoge' /*%end*/ +SELECT /*%expand*/* + FROM employee + WHERE + /*%if @isNotEmpty(name) */ + name = /* name */'hoge' + /*%end*/ diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectBySalary.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectBySalary.sql index bec0d94b..91801447 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectBySalary.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectBySalary.sql @@ -1,6 +1,3 @@ -select - /*%expand*/* -from - employee -where - salary > /* salary */0 +SELECT /*%expand*/* + FROM employee + WHERE salary > /* salary */0 diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectSummedSalary.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectSummedSalary.sql index 4590fa2c..712f70d7 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectSummedSalary.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/selectSummedSalary.sql @@ -1,4 +1,2 @@ -select - sum(salary) -from - employee +SELECT sum(salary) + FROM employee diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/update.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/update.sql index 9c9a4a9f..f0e4106c 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/update.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/EmployeeDao/update.sql @@ -1,13 +1,10 @@ -update - Employee -set - NAME = /* employee.name */'test', - AGE = /* employee.age */10, - DEPARTMENT_ID = /* employee.departmentId */1, - HIREDATE = /* employee.hiredate */date'2010-01-01', - JOB_TYPE = /* employee.jobType */'SALESMAN', - SALARY = /* employee.salary */300, - UPDATE_TIMESTAMP = /* employee.updateTimestamp */timestamp'2010-01-01 12:34:56', - VERSION = /* employee.version */1 -where - ID = /* employee.id */1 +UPDATE Employee + SET NAME = /* employee.name */'test' + , AGE = /* employee.age */10 + , DEPARTMENT_ID = /* employee.departmentId */1 + , HIREDATE = /* employee.hiredate */'2010-01-01' + , JOB_TYPE = /* employee.jobType */'SALESMAN' + , SALARY = /* employee.salary */300 + , UPDATE_TIMESTAMP = /* employee.updateTimestamp */'2010-01-01 12:34:56' + , VERSION = /* employee.version */1 + WHERE ID = /* employee.id */1 diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/OrderDao/selectById.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/OrderDao/selectById.sql index f1eedb47..385fbbab 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/OrderDao/selectById.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/OrderDao/selectById.sql @@ -1,9 +1,15 @@ -select /*%expand */* -from "order" o - left outer join payment pa on o.id = pa.order_id - left outer join "user" u on o.user_id = u.id - left outer join order_item oi on o.id = oi.order_id - left outer join product pr on oi.product_id = pr.id - left outer join product_category pc on pr.id = pc.product_id - left outer join category c on pc.category_id = c.id -where o.id = /* id */0 +SELECT /*%expand */* + FROM "order" o + LEFT OUTER JOIN payment pa + ON o.id = pa.order_id + LEFT OUTER JOIN "user" u + ON o.user_id = u.id + LEFT OUTER JOIN order_item oi + ON o.id = oi.order_id + LEFT OUTER JOIN product pr + ON oi.product_id = pr.id + LEFT OUTER JOIN product_category pc + ON pr.id = pc.product_id + LEFT OUTER JOIN category c + ON pc.category_id = c.id + WHERE o.id = /* id */0 diff --git a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/ReviewDao/selectAll.sql b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/ReviewDao/selectAll.sql index 53950fa1..d56e88a8 100644 --- a/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/ReviewDao/selectAll.sql +++ b/example-sql-file/src/main/resources/META-INF/example/sql/file/dao/ReviewDao/selectAll.sql @@ -1,5 +1,7 @@ -select /*%expand */* -from review r - left outer join product pr on r.product_id = pr.id - left outer join "user" u on r.user_id = u.id -order by r.id +SELECT /*%expand */* + FROM review r + LEFT OUTER JOIN product pr + ON r.product_id = pr.id + LEFT OUTER JOIN "user" u + ON r.user_id = u.id + ORDER BY r.id diff --git a/example-sql-file/src/main/resources/logback.xml b/example-sql-file/src/main/resources/logback.xml index b9f60d32..2b10d6c9 100644 --- a/example-sql-file/src/main/resources/logback.xml +++ b/example-sql-file/src/main/resources/logback.xml @@ -9,6 +9,6 @@ - + \ No newline at end of file