Skip to content

Commit 2a27e9d

Browse files
Support BIGINT Primary Keys (#2611)
1 parent 9b0dbab commit 2a27e9d

5 files changed

Lines changed: 76 additions & 1 deletion

File tree

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Name: simpletest
2-
SchemaVersion: 25.001
2+
SchemaVersion: 25.002
33
SupportedDatabases: mssql, pgsql
44
ManageVersion: true
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
DROP TABLE IF EXISTS vehicle.OwnedVehicles;
2+
DROP TABLE IF EXISTS vehicle.Owners;
3+
4+
CREATE TABLE vehicle.Owners
5+
(
6+
RowId BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 2147483648 INCREMENT BY 1),
7+
Name VARCHAR(100) NOT NULL,
8+
9+
CONSTRAINT PK_Owners PRIMARY KEY (RowId)
10+
);
11+
12+
CREATE TABLE vehicle.OwnedVehicles
13+
(
14+
RowId BIGINT GENERATED BY DEFAULT AS IDENTITY (START WITH 4294967296 INCREMENT BY 1),
15+
Owner BIGINT NOT NULL,
16+
Vehicle INT NOT NULL,
17+
18+
CONSTRAINT PK_OwnedVehicles PRIMARY KEY (RowId)
19+
);
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
DROP TABLE IF EXISTS vehicle.OwnedVehicles;
2+
DROP TABLE IF EXISTS vehicle.Owners;
3+
4+
CREATE TABLE vehicle.Owners
5+
(
6+
RowId BIGINT IDENTITY(2147483648,1) NOT NULL,
7+
Name VARCHAR(100) NOT NULL,
8+
9+
CONSTRAINT PK_Owners PRIMARY KEY (RowId)
10+
);
11+
12+
CREATE TABLE vehicle.OwnedVehicles
13+
(
14+
RowId BIGINT IDENTITY(4294967296,1) NOT NULL,
15+
Owner BIGINT NOT NULL,
16+
Vehicle INT NOT NULL,
17+
18+
CONSTRAINT PK_OwnedVehicles PRIMARY KEY (RowId)
19+
);

modules/simpletest/resources/schemas/vehicle.xml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,4 +339,32 @@
339339
</column>
340340
</columns>
341341
</table>
342+
343+
<table tableName="Owners" tableDbType="TABLE">
344+
<columns>
345+
<column columnName="RowId"/>
346+
<column columnName="Name"/>
347+
</columns>
348+
</table>
349+
350+
<table tableName="OwnedVehicles" tableDbType="TABLE">
351+
<columns>
352+
<column columnName="RowId"/>
353+
<column columnName="Owner">
354+
<fk>
355+
<fkColumnName>RowId</fkColumnName>
356+
<fkTable>Owners</fkTable>
357+
<fkDbSchema>vehicle</fkDbSchema>
358+
</fk>
359+
</column>
360+
<column columnName="Vehicle">
361+
<fk>
362+
<fkColumnName>RowId</fkColumnName>
363+
<fkTable>Vehicles</fkTable>
364+
<fkDbSchema>vehicle</fkDbSchema>
365+
</fk>
366+
</column>
367+
</columns>
368+
</table>
369+
342370
</tables>

src/org/labkey/test/pages/query/UpdateQueryRowPage.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ else if (value instanceof Integer i)
7171
{
7272
setField(entry.getKey(), i);
7373
}
74+
else if (value instanceof Long l)
75+
{
76+
setField(entry.getKey(), l);
77+
}
7478
else if (value instanceof File f)
7579
{
7680
setField(entry.getKey(), f);
@@ -107,6 +111,11 @@ public UpdateQueryRowPage setField(String fieldName, Integer value)
107111
return setField(fieldName, String.valueOf(value));
108112
}
109113

114+
public UpdateQueryRowPage setField(String fieldName, Long value)
115+
{
116+
return setField(fieldName, String.valueOf(value));
117+
}
118+
110119
public UpdateQueryRowPage setField(String fieldName, File file)
111120
{
112121
setFormElement(elementCache().findField(fieldName), file);

0 commit comments

Comments
 (0)