Merge remote-tracking branch 'upstream/master' into wip/6.0_merge_42

hibernate-core/src/test/resources/org/hibernate/orm/test/tool/schema/scripts/multi-line-statements.sql

@@ -2,23 +2,33 @@
 -- Sample file used to test import feature of multiline SQL script (HHH-2403).
 -- Contains various SQL instructions with comments.
 
-INSERT INTO human (id, fname, lname) VALUES (
-	1,
-	'John',
-	'Wick'
+CREATE TABLE test_data (
+  id    NUMBER        NOT NULL   PRIMARY KEY -- primary key
+, text  VARCHAR2(100)                        /* any other data */
 );
 
-INSERT INTO human (id, fname, lname) VALUES (
-	2,
-	'Thomas',
-	'Anderson
--- follow the white rabbit
-/* take the red pill */'
-);
+INSERT INTO test_data VALUES (1, 'sample');
 
-INSERT INTO human (id, fname, lname) VALUES (
-	3,
-	/* a comment */ 'Theodore' /* and another */,
-	'Logan' -- yet a third
-);
+DELETE
+  FROM test_data;
+
+/*
+ * Data insertion...
+ */
+INSERT INTO test_data VALUES (2, 'Multi-line comment line 1
+-- line 2''
+/* line 3 */');
+
+/* Invalid insert: INSERT INTO test_data VALUES (1, NULL); */
+-- INSERT INTO test_data VALUES (1, NULL);
+
+INSERT INTO test_data VALUES (3 /* 'third record' */, NULL /* value */); -- with NULL value
+INSERT INTO test_data (id, text)
+     VALUES
+          (
+            4 -- another record
+          , NULL
+          );
 
+-- comment;
+-- comment;