Skip to content

Commit 18e6374

Browse files
rbygraverbygrave
authored
Merge pull request #3532 from ebean-orm/feature/sql-play-ebean
#3408 play-ebean inline sql comment in test generated scripts
2 parents 4367546 + 3fea5ce commit 18e6374

30 files changed

+195
-29
lines changed

‎ebean-test/src/test/resources/migrationtest/dbmigration/hana/I__create_procs.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ delimiter $$
66
--
77
CREATE OR REPLACE PROCEDURE usp_ebean_drop_foreign_keys(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
88
AS
9+
-- play-ebean-start
910
BEGIN
1011
DECLARE foreign_key_names TABLE(CONSTRAINT_NAME NVARCHAR(256), TABLE_NAME NVARCHAR(256));
1112
DECLARE i INT;
@@ -17,6 +18,7 @@ EXEC 'ALTER TABLE "' || ESCAPE_DOUBLE_QUOTES(:foreign_key_names.TABLE_NAME[i]) |
1718
END FOR;
1819

1920
END;
21+
-- play-ebean-end
2022
$$
2123

2224
delimiter $$
@@ -26,8 +28,10 @@ delimiter $$
2628
--
2729
CREATE OR REPLACE PROCEDURE usp_ebean_drop_column(IN table_name NVARCHAR(256), IN column_name NVARCHAR(256))
2830
AS
31+
-- play-ebean-start
2932
BEGIN
3033
CALL usp_ebean_drop_foreign_keys(table_name, column_name);
3134
EXEC 'ALTER TABLE "' || UPPER(ESCAPE_DOUBLE_QUOTES(table_name)) || '" DROP ("' || UPPER(ESCAPE_DOUBLE_QUOTES(column_name)) || '")';
3235
END;
36+
-- play-ebean-end
3337
$$

‎ebean-test/src/test/resources/migrationtest/dbmigration/hana/idx_hana.migrations‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-745347271, I__create_procs.sql
1+
1349158244, I__create_procs.sql
22
-2017770851, 1.0__initial.sql
33
-475843596, 1.1.sql
44
1535221752, 1.2__dropsFor_1.1.sql

‎ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/I__create_procs.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ delimiter $$
77
-- deletes all constraints and foreign keys referring to TABLE.COLUMN
88
--
99
CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
10+
-- play-ebean-start
1011
BEGIN
1112
DECLARE done INT DEFAULT FALSE;
1213
DECLARE c_fk_name CHAR(255);
@@ -29,6 +30,7 @@ END LOOP;
2930

3031
CLOSE curs;
3132
END
33+
-- play-ebean-end
3234
$$
3335

3436
DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
@@ -39,10 +41,12 @@ delimiter $$
3941
-- deletes the column and ensures that all indices and constraints are dropped first
4042
--
4143
CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
44+
-- play-ebean-start
4245
BEGIN
4346
CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
4447
SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
4548
PREPARE stmt FROM @sql;
4649
EXECUTE stmt;
4750
END
51+
-- play-ebean-end
4852
$$

‎ebean-test/src/test/resources/migrationtest/dbmigration/mariadb/idx_mariadb.migrations‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-1933396282, I__create_procs.sql
1+
-1617676189, I__create_procs.sql
22
-2111548334, 1.0__initial.sql
33
1085383251, 1.1.sql
44
1187950993, 1.2__dropsFor_1.1.sql

‎ebean-test/src/test/resources/migrationtest/dbmigration/mysql/I__create_procs.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ delimiter $$
77
-- deletes all constraints and foreign keys referring to TABLE.COLUMN
88
--
99
CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
10+
-- play-ebean-start
1011
BEGIN
1112
DECLARE done INT DEFAULT FALSE;
1213
DECLARE c_fk_name CHAR(255);
@@ -29,6 +30,7 @@ END LOOP;
2930

3031
CLOSE curs;
3132
END
33+
-- play-ebean-end
3234
$$
3335

3436
DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
@@ -39,10 +41,12 @@ delimiter $$
3941
-- deletes the column and ensures that all indices and constraints are dropped first
4042
--
4143
CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
44+
-- play-ebean-start
4245
BEGIN
4346
CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
4447
SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
4548
PREPARE stmt FROM @sql;
4649
EXECUTE stmt;
4750
END
51+
-- play-ebean-end
4852
$$

‎ebean-test/src/test/resources/migrationtest/dbmigration/mysql/idx_mysql.migrations‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-1933396282, I__create_procs.sql
1+
-1617676189, I__create_procs.sql
22
1980830787, 1.0__initial.sql
33
-151422898, 1.1.sql
44
-1097227916, 1.2__dropsFor_1.1.sql

‎ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/I__create_procs.sql‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ delimiter $$
77
-- deletes all constraints and foreign keys referring to TABLE.COLUMN
88
--
99
CREATE PROCEDURE usp_ebean_drop_foreign_keys(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
10+
-- play-ebean-start
1011
BEGIN
1112
DECLARE done INT DEFAULT FALSE;
1213
DECLARE c_fk_name CHAR(255);
@@ -29,6 +30,7 @@ END LOOP;
2930

3031
CLOSE curs;
3132
END
33+
-- play-ebean-end
3234
$$
3335

3436
DROP PROCEDURE IF EXISTS usp_ebean_drop_column;
@@ -39,10 +41,12 @@ delimiter $$
3941
-- deletes the column and ensures that all indices and constraints are dropped first
4042
--
4143
CREATE PROCEDURE usp_ebean_drop_column(IN p_table_name VARCHAR(255), IN p_column_name VARCHAR(255))
44+
-- play-ebean-start
4245
BEGIN
4346
CALL usp_ebean_drop_foreign_keys(p_table_name, p_column_name);
4447
SET @sql = CONCAT('ALTER TABLE `', p_table_name, '` DROP COLUMN `', p_column_name, '`');
4548
PREPARE stmt FROM @sql;
4649
EXECUTE stmt;
4750
END
51+
-- play-ebean-end
4852
$$

‎ebean-test/src/test/resources/migrationtest/dbmigration/mysql55/idx_mysql.migrations‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
-1933396282, I__create_procs.sql
1+
-1617676189, I__create_procs.sql
22
369577572, 1.0__initial.sql
33
-151422898, 1.1.sql
44
-1097227916, 1.2__dropsFor_1.1.sql

‎ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.0__initial.sql‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ alter table migtest_e_history6 add column if not exists sys_period tstzrange not
198198
create table migtest_e_history2_history(like migtest_e_history2);
199199
create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
200200
create or replace function migtest_e_history2_history_version() returns trigger as $$
201+
-- play-ebean-start
201202
declare
202203
lowerTs timestamptz;
203204
upperTs timestamptz;
@@ -213,6 +214,7 @@ begin
213214
return old;
214215
end if;
215216
end;
217+
-- play-ebean-end
216218
$$ LANGUAGE plpgsql;
217219

218220
create trigger migtest_e_history2_history_upd
@@ -223,6 +225,7 @@ create trigger migtest_e_history2_history_upd
223225
create table migtest_e_history3_history(like migtest_e_history3);
224226
create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
225227
create or replace function migtest_e_history3_history_version() returns trigger as $$
228+
-- play-ebean-start
226229
declare
227230
lowerTs timestamptz;
228231
upperTs timestamptz;
@@ -238,6 +241,7 @@ begin
238241
return old;
239242
end if;
240243
end;
244+
-- play-ebean-end
241245
$$ LANGUAGE plpgsql;
242246

243247
create trigger migtest_e_history3_history_upd
@@ -248,6 +252,7 @@ create trigger migtest_e_history3_history_upd
248252
create table migtest_e_history4_history(like migtest_e_history4);
249253
create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
250254
create or replace function migtest_e_history4_history_version() returns trigger as $$
255+
-- play-ebean-start
251256
declare
252257
lowerTs timestamptz;
253258
upperTs timestamptz;
@@ -263,6 +268,7 @@ begin
263268
return old;
264269
end if;
265270
end;
271+
-- play-ebean-end
266272
$$ LANGUAGE plpgsql;
267273

268274
create trigger migtest_e_history4_history_upd
@@ -273,6 +279,7 @@ create trigger migtest_e_history4_history_upd
273279
create table migtest_e_history5_history(like migtest_e_history5);
274280
create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
275281
create or replace function migtest_e_history5_history_version() returns trigger as $$
282+
-- play-ebean-start
276283
declare
277284
lowerTs timestamptz;
278285
upperTs timestamptz;
@@ -288,6 +295,7 @@ begin
288295
return old;
289296
end if;
290297
end;
298+
-- play-ebean-end
291299
$$ LANGUAGE plpgsql;
292300

293301
create trigger migtest_e_history5_history_upd
@@ -298,6 +306,7 @@ create trigger migtest_e_history5_history_upd
298306
create table migtest_e_history6_history(like migtest_e_history6);
299307
create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
300308
create or replace function migtest_e_history6_history_version() returns trigger as $$
309+
-- play-ebean-start
301310
declare
302311
lowerTs timestamptz;
303312
upperTs timestamptz;
@@ -313,6 +322,7 @@ begin
313322
return old;
314323
end if;
315324
end;
325+
-- play-ebean-end
316326
$$ LANGUAGE plpgsql;
317327

318328
create trigger migtest_e_history6_history_upd
@@ -323,6 +333,7 @@ create trigger migtest_e_history6_history_upd
323333
create table table_history(like "table");
324334
create view table_with_history as select * from "table" union all select * from table_history;
325335
create or replace function table_history_version() returns trigger as $$
336+
-- play-ebean-start
326337
declare
327338
lowerTs timestamptz;
328339
upperTs timestamptz;
@@ -338,6 +349,7 @@ begin
338349
return old;
339350
end if;
340351
end;
352+
-- play-ebean-end
341353
$$ LANGUAGE plpgsql;
342354

343355
create trigger table_history_upd

‎ebean-test/src/test/resources/migrationtest/dbmigration/postgres/1.1.sql‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ alter table migtest_e_basic add constraint uq_migtest_e_basic_indextest5 unique
255255
create table migtest_e_history_history(like migtest_e_history);
256256
create view migtest_e_history_with_history as select * from migtest_e_history union all select * from migtest_e_history_history;
257257
create or replace function migtest_e_history_history_version() returns trigger as $$
258+
-- play-ebean-start
258259
declare
259260
lowerTs timestamptz;
260261
upperTs timestamptz;
@@ -270,6 +271,7 @@ begin
270271
return old;
271272
end if;
272273
end;
274+
-- play-ebean-end
273275
$$ LANGUAGE plpgsql;
274276

275277
create trigger migtest_e_history_history_upd
@@ -281,6 +283,7 @@ comment on column migtest_e_history.test_string is 'Column altered to long now';
281283
comment on table migtest_e_history is 'We have history now';
282284
create view migtest_e_history2_with_history as select * from migtest_e_history2 union all select * from migtest_e_history2_history;
283285
create or replace function migtest_e_history2_history_version() returns trigger as $$
286+
-- play-ebean-start
284287
declare
285288
lowerTs timestamptz;
286289
upperTs timestamptz;
@@ -296,6 +299,7 @@ begin
296299
return old;
297300
end if;
298301
end;
302+
-- play-ebean-end
299303
$$ LANGUAGE plpgsql;
300304

301305
create trigger migtest_e_history2_history_upd
@@ -304,6 +308,7 @@ create trigger migtest_e_history2_history_upd
304308

305309
create view migtest_e_history3_with_history as select * from migtest_e_history3 union all select * from migtest_e_history3_history;
306310
create or replace function migtest_e_history3_history_version() returns trigger as $$
311+
-- play-ebean-start
307312
declare
308313
lowerTs timestamptz;
309314
upperTs timestamptz;
@@ -319,6 +324,7 @@ begin
319324
return old;
320325
end if;
321326
end;
327+
-- play-ebean-end
322328
$$ LANGUAGE plpgsql;
323329

324330
create trigger migtest_e_history3_history_upd
@@ -327,6 +333,7 @@ create trigger migtest_e_history3_history_upd
327333

328334
create view migtest_e_history4_with_history as select * from migtest_e_history4 union all select * from migtest_e_history4_history;
329335
create or replace function migtest_e_history4_history_version() returns trigger as $$
336+
-- play-ebean-start
330337
declare
331338
lowerTs timestamptz;
332339
upperTs timestamptz;
@@ -342,6 +349,7 @@ begin
342349
return old;
343350
end if;
344351
end;
352+
-- play-ebean-end
345353
$$ LANGUAGE plpgsql;
346354

347355
create trigger migtest_e_history4_history_upd
@@ -350,6 +358,7 @@ create trigger migtest_e_history4_history_upd
350358

351359
create view migtest_e_history5_with_history as select * from migtest_e_history5 union all select * from migtest_e_history5_history;
352360
create or replace function migtest_e_history5_history_version() returns trigger as $$
361+
-- play-ebean-start
353362
declare
354363
lowerTs timestamptz;
355364
upperTs timestamptz;
@@ -365,6 +374,7 @@ begin
365374
return old;
366375
end if;
367376
end;
377+
-- play-ebean-end
368378
$$ LANGUAGE plpgsql;
369379

370380
create trigger migtest_e_history5_history_upd
@@ -373,6 +383,7 @@ create trigger migtest_e_history5_history_upd
373383

374384
create view migtest_e_history6_with_history as select * from migtest_e_history6 union all select * from migtest_e_history6_history;
375385
create or replace function migtest_e_history6_history_version() returns trigger as $$
386+
-- play-ebean-start
376387
declare
377388
lowerTs timestamptz;
378389
upperTs timestamptz;
@@ -388,6 +399,7 @@ begin
388399
return old;
389400
end if;
390401
end;
402+
-- play-ebean-end
391403
$$ LANGUAGE plpgsql;
392404

393405
create trigger migtest_e_history6_history_upd
@@ -397,6 +409,7 @@ create trigger migtest_e_history6_history_upd
397409
comment on column "table"."index" is 'this is an other comment';
398410
create view table_with_history as select * from "table" union all select * from table_history;
399411
create or replace function table_history_version() returns trigger as $$
412+
-- play-ebean-start
400413
declare
401414
lowerTs timestamptz;
402415
upperTs timestamptz;
@@ -412,6 +425,7 @@ begin
412425
return old;
413426
end if;
414427
end;
428+
-- play-ebean-end
415429
$$ LANGUAGE plpgsql;
416430

417431
create trigger table_history_upd

0 commit comments

Comments
 (0)