update some TCK dependencies, Add sql scripts, add LASTNAMEEMPLOYEES_KEY column to table EMP_MAPKEYCOL2 for https://github.com/jakartaee/persistence/issues/1010 by scottmarlow · Pull Request #1017 · jakartaee/persistence

scottmarlow · 2026-04-22T12:54:03Z

Add SQL scripts and table change for #1010

…e#1010 Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

scottmarlow · 2026-04-22T12:57:18Z

@kuuku123 please confirm that the added tck/sql/derby/derby.ddl.persistence.sql matches what you tested with your 629b325 change.

scottmarlow · 2026-04-22T14:38:58Z

Apparently the check failure is due to the SQL script files not including the project copyright license:

[315](https://github.com/jakartaee/persistence/actions/runs/24779385472/job/72506054805?pr=1017#step:4:4316)
[INFO] --- glassfish-copyright:2.4:check (default-cli) @ persistence-tck-parent ---
/home/runner/work/persistence/persistence/tck/sql/oracle/oracle.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/oracle/oracle.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mssqlserver/mssqlserver.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mssqlserver/mssqlserver.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/postgresql/postgresql.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/postgresql/postgresql.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/sybase/sybase.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/sybase/sybase.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mysql/mysql.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mysql/mysql.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/derby/derby.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/derby/derby.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/db2/db2.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/db2/db2.ddl.persistence.sprocs.sql: No copyright
Error:  Errors: 14[315](https://github.com/jakartaee/persistence/actions/runs/24779385472/job/72506054805?pr=1017#step:4:4316)
[INFO] --- glassfish-copyright:2.4:check (default-cli) @ persistence-tck-parent ---
/home/runner/work/persistence/persistence/tck/sql/oracle/oracle.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/oracle/oracle.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mssqlserver/mssqlserver.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mssqlserver/mssqlserver.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/postgresql/postgresql.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/postgresql/postgresql.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/sybase/sybase.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/sybase/sybase.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mysql/mysql.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/mysql/mysql.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/derby/derby.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/derby/derby.ddl.persistence.sprocs.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/db2/db2.ddl.persistence.sql: No copyright
/home/runner/work/persistence/persistence/tck/sql/db2/db2.ddl.persistence.sprocs.sql: No copyright
Error:  Errors: 14

lukasj · 2026-04-22T15:32:32Z

      run: |
          mvn -B -U -C -V clean install -Poss-release -Dgpg.skip=true -DskipTests ${{ matrix.java-version.extra_args }}
-          mvn org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Poss-release -Dgpg.skip=true -Dcopyright.ignoreyear=true ${{ matrix.java-version.extra_args }}
+          mvn org.glassfish.copyright:glassfish-copyright-maven-plugin:check -Poss-release -Dgpg.skip=true -Dcopyright.ignoreyear=true ${{ matrix.java-version.extra_args }} -Dcopyright.exclude=persistence/tck/sql/oracle/oracle.ddl.persistence.sprocs.sql,persistence/tck/sql/oracle/oracle.ddl.persistence.sql,persistence/tck/sql/mssqlserver/mssqlserver.ddl.persistence.sql,persistence/tck/sql/mssqlserver/mssqlserver.ddl.persistence.sprocs.sql,persistence/tck/sql/postgresql/postgresql.ddl.persistence.sql,persistence/tck/sql/postgresql/postgresql.ddl.persistence.sprocs.sql,persistence/tck/sql/sybase/sybase.ddl.persistence.sql,persistence/tck/sql/sybase/sybase.ddl.persistence.sprocs.sql,persistence/tck/sql/mysql/mysql.ddl.persistence.sql,persistence/tck/sql/mysql/mysql.ddl.persistence.sprocs.sql,persistence/tck/sql/derby/derby.ddl.persistence.sql,persistence/tck/sql/derby/derby.ddl.persistence.sprocs.sql,persistence/tck/sql/db2/db2.ddl.persistence.sql,persistence/tck/sql/db2/db2.ddl.persistence.sprocs.sql


consider updating and/or reusing project-widecopyright-exclude, see https://github.com/jakartaee/persistence/blob/main/copyright-exclude and/or https://github.com/eclipse-ee4j/glassfish-copyright-plugin/blob/master/src/main/java/org/glassfish/copyright/AbstractCopyrightMojo.java#L44

Thanks @lukasj! Will reuse the project-wide copyright-exclude!

Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

kuuku123 · 2026-04-23T00:11:12Z

@scottmarlow

@kuuku123 please confirm that the added tck/sql/derby/derby.ddl.persistence.sql matches what you tested with your 629b325 change.

yes it does.
LASTNAMEEMPLOYEES_KEY VARCHAR(255), is what i added and tested

gavinking · 2026-04-24T08:17:13Z

Derby? Isn't that project dead now?

scottmarlow · 2026-04-24T13:01:23Z

Derby? Isn't that project dead now?

Yes but users could still use it for a while until it stops working. @kuuku123 mentioned he is using Derby still.

kuuku123 · 2026-04-27T00:54:38Z

yes we are still using it

marko-bekhta · 2026-04-27T10:39:58Z

@@ -0,0 +1,918 @@
+
+DROP TABLE ADDRESS!


What would be the expectations on these DDLs within the standalone TCK ?

Note that currently the TCK tests are using the drop-and-create unless the test does not require the schema or if the schema has to be created "manually" by the test itself:

persistence/tck/common/src/main/java/ee/jakarta/tck/persistence/common/PMClientBase.java

Lines 538 to 540 in 3b31688

if (dropCreateSchemaOnStartByDefault()) {

jpaProps.put(JAKARTA_SCHEMAGEN_DATABASE_ACTION, "drop-and-create");

}

So wouldn't these scripts cause confusion as to how they are supposed to be used ?

marko-bekhta · 2026-04-27T10:42:31Z

@@ -0,0 +1,23 @@
+DROP PROCEDURE GetEmpOneFirstNameFromOut !
+CREATE PROCEDURE GetEmpOneFirstNameFromOut (out OUT_PARAM VARCHAR(255)) LANGUAGE SQL BEGIN SELECT FIRSTNAME into OUT_PARAM FROM EMPLOYEE WHERE ID=1; END !


ah if we have procedure scripts for DBs other than Postgres then we should feed that to:

persistence/tck/spec-tests/src/main/java/ee/jakarta/tck/persistence/core/StoredProcedureQuery/Client.java

Lines 75 to 91 in 7223104

protected Map<String, Object> extraPersistenceUnitProperties() {

assertTrue(Objects.toString(myProps.get(JAKARTA_PERSISTENCE_JDBC_DRIVER), "").toLowerCase(Locale.ROOT).contains("postgresql"),

"This test only contains procedures for the PostgreSQL database. Running on other DBs may result in an unpredictable outcome.");

return Map.of(Persistence.SchemaManagementProperties.SCHEMAGEN_CREATE_SCRIPT_SOURCE,

new StringReader(

"CREATE TABLE IF NOT EXISTS EMPLOYEE (HIREDATE date, ID integer not null, SALARY float4, FIRSTNAME varchar(255), LASTNAME varchar(255), primary key (ID)); \n"

+ "CREATE OR REPLACE PROCEDURE Integer_Proc(out pmax integer, out pmin integer, out pnull integer) LANGUAGE plpgsql AS $$ BEGIN SELECT MAX_VAL, MIN_VAL, NULL_VAL INTO pmax, pmin, pnull FROM Integer_Tab; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE GetEmpOneFirstNameFromOut(out OUT_PARAM text) LANGUAGE plpgsql AS $$ BEGIN SELECT FIRSTNAME INTO OUT_PARAM FROM EMPLOYEE WHERE ID=1; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE GetEmpFirstNameFromOut(in IN_PARAM int, out OUT_PARAM text) LANGUAGE plpgsql AS $$ BEGIN SELECT FIRSTNAME INTO OUT_PARAM FROM EMPLOYEE WHERE ID=IN_PARAM; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE GetEmpLastNameFromInOut(inout INOUT_PARAM text) LANGUAGE plpgsql AS $$ BEGIN SELECT LASTNAME INTO INOUT_PARAM FROM EMPLOYEE WHERE ID=CAST(INOUT_PARAM AS int); END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE GetEmpASCFromRS(out ref refcursor) LANGUAGE plpgsql AS $$ BEGIN OPEN ref FOR SELECT ID, FIRSTNAME, LASTNAME, HIREDATE, SALARY FROM EMPLOYEE ORDER BY ID ASC; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE GetEmpIdFNameLNameFromRS(in IN_PARAM int, out ref refcursor) LANGUAGE plpgsql AS $$ BEGIN OPEN ref FOR SELECT ID, FIRSTNAME, LASTNAME FROM EMPLOYEE WHERE ID=IN_PARAM; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE GetEmpIdUsingHireDateFromOut(in IN_PARAM DATE, out OUT_PARAM int) LANGUAGE plpgsql AS $$ BEGIN SELECT ID INTO OUT_PARAM FROM EMPLOYEE WHERE HIREDATE=IN_PARAM; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE UpdateEmpSalaryColumn() LANGUAGE plpgsql AS $$ BEGIN UPDATE EMPLOYEE SET SALARY=0.00; END; $$ ;\n"

+ "CREATE OR REPLACE PROCEDURE DeleteAllEmp() LANGUAGE plpgsql AS $$ BEGIN DELETE FROM EMPLOYEE; END; $$ ;\n"

));

}

how about we package them as resources in the tck/common jar and then read them in the test depending on the input parameter passed to surefiure/failsafe and default to use Postgres if no property was passed ?

marko-bekhta · 2026-04-27T10:44:04Z

+        <!--
+        No idea why, but it seems these two dependencies are required to make it work,
+        even though they are a transitive dependency of persistence-tck-common?!
+        -->
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>signaturetest</artifactId>
+            <version>${jakarta.tck.sigtest.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.tck</groupId>
+            <artifactId>sigtest-maven-plugin</artifactId>
+            <version>2.6</version>
+        </dependency>
+


just to link to the related issue: #897

if we make the sigtest work then maybe we close that on ^ or we just remove the sigtest 🙈 🙂 ?

gavinking · 2026-04-27T11:01:56Z

I wonder if we should add a way to specify platform-specific DDL in the XML descriptor. We do already have such a thing in Hibernate, IIRC.

gavinking · 2026-04-27T11:48:24Z

See #1023

beikov and others added 3 commits April 22, 2026 08:32

Add SQL files to distributed ZIP and ensure TCK works

2d85515

Add LASTNAMEEMPLOYEES_KEY column to table EMP_MAPKEYCOL2 for jakartae…

9e1499c

…e#1010 Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

Use more recent Jakarta EE 11 TCK artifacts

6c01733

Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

scottmarlow added the TCK label Apr 22, 2026

scottmarlow marked this pull request as draft April 22, 2026 13:02

lukasj reviewed Apr 22, 2026

View reviewed changes

Exclude sql script files and update copyright year of root pom.xml

1ea5d83

Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

scottmarlow force-pushed the add_sql_scripts branch from 19f6601 to 1ea5d83 Compare April 22, 2026 15:58

scottmarlow marked this pull request as ready for review April 22, 2026 16:08

Remove unused jakarta.jakartaee-bom.version

8111fa1

Signed-off-by: Scott Marlow <scott.marlow@ibm.com>

marko-bekhta reviewed Apr 27, 2026

View reviewed changes

marko-bekhta mentioned this pull request May 22, 2026

database-specific DDL for schema export #1023

Open

	if (dropCreateSchemaOnStartByDefault()) {
	jpaProps.put(JAKARTA_SCHEMAGEN_DATABASE_ACTION, "drop-and-create");
	}

		@@ -0,0 +1,23 @@
		DROP PROCEDURE GetEmpOneFirstNameFromOut !
		CREATE PROCEDURE GetEmpOneFirstNameFromOut (out OUT_PARAM VARCHAR(255)) LANGUAGE SQL BEGIN SELECT FIRSTNAME into OUT_PARAM FROM EMPLOYEE WHERE ID=1; END !

	protected Map<String, Object> extraPersistenceUnitProperties() {
	assertTrue(Objects.toString(myProps.get(JAKARTA_PERSISTENCE_JDBC_DRIVER), "").toLowerCase(Locale.ROOT).contains("postgresql"),
	"This test only contains procedures for the PostgreSQL database. Running on other DBs may result in an unpredictable outcome.");
	return Map.of(Persistence.SchemaManagementProperties.SCHEMAGEN_CREATE_SCRIPT_SOURCE,
	new StringReader(
	"CREATE TABLE IF NOT EXISTS EMPLOYEE (HIREDATE date, ID integer not null, SALARY float4, FIRSTNAME varchar(255), LASTNAME varchar(255), primary key (ID)); \n"
	+ "CREATE OR REPLACE PROCEDURE Integer_Proc(out pmax integer, out pmin integer, out pnull integer) LANGUAGE plpgsql AS $$ BEGIN SELECT MAX_VAL, MIN_VAL, NULL_VAL INTO pmax, pmin, pnull FROM Integer_Tab; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE GetEmpOneFirstNameFromOut(out OUT_PARAM text) LANGUAGE plpgsql AS $$ BEGIN SELECT FIRSTNAME INTO OUT_PARAM FROM EMPLOYEE WHERE ID=1; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE GetEmpFirstNameFromOut(in IN_PARAM int, out OUT_PARAM text) LANGUAGE plpgsql AS $$ BEGIN SELECT FIRSTNAME INTO OUT_PARAM FROM EMPLOYEE WHERE ID=IN_PARAM; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE GetEmpLastNameFromInOut(inout INOUT_PARAM text) LANGUAGE plpgsql AS $$ BEGIN SELECT LASTNAME INTO INOUT_PARAM FROM EMPLOYEE WHERE ID=CAST(INOUT_PARAM AS int); END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE GetEmpASCFromRS(out ref refcursor) LANGUAGE plpgsql AS $$ BEGIN OPEN ref FOR SELECT ID, FIRSTNAME, LASTNAME, HIREDATE, SALARY FROM EMPLOYEE ORDER BY ID ASC; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE GetEmpIdFNameLNameFromRS(in IN_PARAM int, out ref refcursor) LANGUAGE plpgsql AS $$ BEGIN OPEN ref FOR SELECT ID, FIRSTNAME, LASTNAME FROM EMPLOYEE WHERE ID=IN_PARAM; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE GetEmpIdUsingHireDateFromOut(in IN_PARAM DATE, out OUT_PARAM int) LANGUAGE plpgsql AS $$ BEGIN SELECT ID INTO OUT_PARAM FROM EMPLOYEE WHERE HIREDATE=IN_PARAM; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE UpdateEmpSalaryColumn() LANGUAGE plpgsql AS $$ BEGIN UPDATE EMPLOYEE SET SALARY=0.00; END; $$ ;\n"
	+ "CREATE OR REPLACE PROCEDURE DeleteAllEmp() LANGUAGE plpgsql AS $$ BEGIN DELETE FROM EMPLOYEE; END; $$ ;\n"
	));
	}

Uh oh!

Conversation

scottmarlow commented Apr 22, 2026

Uh oh!

scottmarlow commented Apr 22, 2026

Uh oh!

scottmarlow commented Apr 22, 2026

Uh oh!

lukasj Apr 22, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

scottmarlow Apr 22, 2026

Choose a reason for hiding this comment

Uh oh!

kuuku123 commented Apr 23, 2026

Uh oh!

gavinking commented Apr 24, 2026

Uh oh!

scottmarlow commented Apr 24, 2026

Uh oh!

kuuku123 commented Apr 27, 2026

Uh oh!

marko-bekhta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

marko-bekhta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

marko-bekhta Apr 27, 2026

Choose a reason for hiding this comment

Uh oh!

gavinking commented Apr 27, 2026

Uh oh!

gavinking commented Apr 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

lukasj Apr 22, 2026 •

edited

Loading