Skip to content

Commit

Permalink
Allow columns with generateOnUpdate as primary
Browse files Browse the repository at this point in the history
  • Loading branch information
safris committed Jul 24, 2023
1 parent ef6438a commit 9ae78e6
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions jsql/src/main/java/org/jaxdb/jsql/generator/TableModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,6 @@ private static ColumnModel getColumnModel(final int index, final TableModel tabl
final $Tinyint integer = ($Tinyint)column;
if (integer.getSqlxGenerateOnUpdate$() != null) {
if ($Tinyint.GenerateOnUpdate$.INCREMENT.text().equals(integer.getSqlxGenerateOnUpdate$().text())) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

generateOnUpdate = GenerateOn.INCREMENT;
}
else {
Expand All @@ -425,9 +422,6 @@ private static ColumnModel getColumnModel(final int index, final TableModel tabl
final $Smallint integer = ($Smallint)column;
if (integer.getSqlxGenerateOnUpdate$() != null) {
if ($Smallint.GenerateOnUpdate$.INCREMENT.text().equals(integer.getSqlxGenerateOnUpdate$().text())) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

generateOnUpdate = GenerateOn.INCREMENT;
}
else {
Expand Down Expand Up @@ -462,9 +456,6 @@ else if ($Int.GenerateOnInsert$.EPOCH_5FSECONDS.text().equals(integer.getSqlxGen
}

if (integer.getSqlxGenerateOnUpdate$() != null) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

if ($Int.GenerateOnUpdate$.INCREMENT.text().equals(integer.getSqlxGenerateOnUpdate$().text())) {
generateOnUpdate = GenerateOn.INCREMENT;
}
Expand Down Expand Up @@ -518,9 +509,6 @@ else if ($Bigint.GenerateOnInsert$.EPOCH_5FMILLIS.text().equals(integer.getSqlxG
}

if (integer.getSqlxGenerateOnUpdate$() != null) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

if ($Bigint.GenerateOnUpdate$.INCREMENT.text().equals(integer.getSqlxGenerateOnUpdate$().text())) {
generateOnUpdate = GenerateOn.INCREMENT;
}
Expand Down Expand Up @@ -581,9 +569,6 @@ else if ($Bigint.GenerateOnUpdate$.EPOCH_5FMILLIS.text().equals(integer.getSqlxG

if (col.getSqlxGenerateOnUpdate$() != null) {
if ($Date.GenerateOnUpdate$.TIMESTAMP.text().equals(col.getSqlxGenerateOnUpdate$().text())) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

generateOnUpdate = GenerateOn.TIMESTAMP;
}
else {
Expand All @@ -605,9 +590,6 @@ else if ($Bigint.GenerateOnUpdate$.EPOCH_5FMILLIS.text().equals(integer.getSqlxG

if (col.getSqlxGenerateOnUpdate$() != null) {
if ($Time.GenerateOnUpdate$.TIMESTAMP.text().equals(col.getSqlxGenerateOnUpdate$().text())) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

generateOnUpdate = GenerateOn.TIMESTAMP;
}
else {
Expand All @@ -629,9 +611,6 @@ else if ($Bigint.GenerateOnUpdate$.EPOCH_5FMILLIS.text().equals(integer.getSqlxG

if (col.getSqlxGenerateOnUpdate$() != null) {
if ($Datetime.GenerateOnUpdate$.TIMESTAMP.text().equals(col.getSqlxGenerateOnUpdate$().text())) {
if (isPrimary)
throw new GeneratorExecutionException("Primary column \"" + tableModel.table.getName$().text() + "." + column.getName$().text() + "\" cannot specify generateOnUpdate");

generateOnUpdate = GenerateOn.TIMESTAMP;
}
else {
Expand Down

0 comments on commit 9ae78e6

Please sign in to comment.