From b757853ac6a0be5b1d5a26f9cfef26eb9be3853a Mon Sep 17 00:00:00 2001 From: Koda Date: Wed, 13 Sep 2017 20:02:11 +0900 Subject: [PATCH] #832 change update sequence process --- .../project/knowledge/dao/gen/GenAccountImagesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenActivitiesDao.java | 9 +++++++-- .../support/project/knowledge/dao/gen/GenBadgesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenCommentsDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenDraftKnowledgesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenKnowledgeFilesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenKnowledgesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenLikeCommentsDao.java | 9 +++++++-- .../support/project/knowledge/dao/gen/GenLikesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenMailHooksDao.java | 9 +++++++-- .../support/project/knowledge/dao/gen/GenPinsDao.java | 9 +++++++-- .../support/project/knowledge/dao/gen/GenStocksDao.java | 9 +++++++-- .../support/project/knowledge/dao/gen/GenTagsDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenTemplateMastersDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenViewHistoriesDao.java | 9 +++++++-- .../support/project/knowledge/dao/gen/GenVotesDao.java | 9 +++++++-- .../project/knowledge/dao/gen/GenWebhookConfigsDao.java | 9 +++++++-- 17 files changed, 119 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java index 0827f862c..ee7583c36 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenAccountImagesDao.java @@ -187,8 +187,13 @@ public AccountImagesEntity rawPhysicalInsert(AccountImagesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('ACCOUNT_IMAGES_IMAGE_ID_seq', (select max(IMAGE_ID) from ACCOUNT_IMAGES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(IMAGE_ID) from ACCOUNT_IMAGES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('ACCOUNT_IMAGES_IMAGE_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java index 77bcf0065..229f24c1a 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenActivitiesDao.java @@ -183,8 +183,13 @@ public ActivitiesEntity rawPhysicalInsert(ActivitiesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('ACTIVITIES_ACTIVITY_NO_seq', (select max(ACTIVITY_NO) from ACTIVITIES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(ACTIVITY_NO) from ACTIVITIES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('ACTIVITIES_ACTIVITY_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java index 8c159b812..29f69fb35 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenBadgesDao.java @@ -185,8 +185,13 @@ public BadgesEntity rawPhysicalInsert(BadgesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('BADGES_NO_seq', (select max(NO) from BADGES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(NO) from BADGES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('BADGES_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java index f8f48dfd7..0b0a097ec 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenCommentsDao.java @@ -183,8 +183,13 @@ public CommentsEntity rawPhysicalInsert(CommentsEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('COMMENTS_COMMENT_NO_seq', (select max(COMMENT_NO) from COMMENTS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(COMMENT_NO) from COMMENTS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('COMMENTS_COMMENT_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java index 943943414..d04f0e8cd 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenDraftKnowledgesDao.java @@ -188,8 +188,13 @@ public DraftKnowledgesEntity rawPhysicalInsert(DraftKnowledgesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('DRAFT_KNOWLEDGES_DRAFT_ID_seq', (select max(DRAFT_ID) from DRAFT_KNOWLEDGES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(DRAFT_ID) from DRAFT_KNOWLEDGES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('DRAFT_KNOWLEDGES_DRAFT_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java index a996f7a7c..4d72c4c5e 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgeFilesDao.java @@ -188,8 +188,13 @@ public KnowledgeFilesEntity rawPhysicalInsert(KnowledgeFilesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('KNOWLEDGE_FILES_FILE_NO_seq', (select max(FILE_NO) from KNOWLEDGE_FILES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(FILE_NO) from KNOWLEDGE_FILES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('KNOWLEDGE_FILES_FILE_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java index 96d323737..5a3da55df 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenKnowledgesDao.java @@ -191,8 +191,13 @@ public KnowledgesEntity rawPhysicalInsert(KnowledgesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('KNOWLEDGES_KNOWLEDGE_ID_seq', (select max(KNOWLEDGE_ID) from KNOWLEDGES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(KNOWLEDGE_ID) from KNOWLEDGES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('KNOWLEDGES_KNOWLEDGE_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java index 95dc16aae..013583b20 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikeCommentsDao.java @@ -182,8 +182,13 @@ public LikeCommentsEntity rawPhysicalInsert(LikeCommentsEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('LIKE_COMMENTS_NO_seq', (select max(NO) from LIKE_COMMENTS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(NO) from LIKE_COMMENTS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('LIKE_COMMENTS_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java index 2b8a4a564..bef04434c 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenLikesDao.java @@ -182,8 +182,13 @@ public LikesEntity rawPhysicalInsert(LikesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('LIKES_NO_seq', (select max(NO) from LIKES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(NO) from LIKES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('LIKES_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java index a34ab4d24..ddd6a8620 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenMailHooksDao.java @@ -187,8 +187,13 @@ public MailHooksEntity rawPhysicalInsert(MailHooksEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('MAIL_HOOKS_HOOK_ID_seq', (select max(HOOK_ID) from MAIL_HOOKS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(HOOK_ID) from MAIL_HOOKS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('MAIL_HOOKS_HOOK_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java index 689df893e..b47f2cf99 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenPinsDao.java @@ -182,8 +182,13 @@ public PinsEntity rawPhysicalInsert(PinsEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('PINS_NO_seq', (select max(NO) from PINS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(NO) from PINS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('PINS_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java index 6c30ac221..e18d4a1d9 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenStocksDao.java @@ -183,8 +183,13 @@ public StocksEntity rawPhysicalInsert(StocksEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('STOCKS_STOCK_ID_seq', (select max(STOCK_ID) from STOCKS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(STOCK_ID) from STOCKS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('STOCKS_STOCK_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java index e1c181ce2..4cdba1926 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTagsDao.java @@ -181,8 +181,13 @@ public TagsEntity rawPhysicalInsert(TagsEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('TAGS_TAG_ID_seq', (select max(TAG_ID) from TAGS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(TAG_ID) from TAGS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('TAGS_TAG_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java index e32d8a4a8..dbce0f8ea 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenTemplateMastersDao.java @@ -183,8 +183,13 @@ public TemplateMastersEntity rawPhysicalInsert(TemplateMastersEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('TEMPLATE_MASTERS_TYPE_ID_seq', (select max(TYPE_ID) from TEMPLATE_MASTERS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(TYPE_ID) from TEMPLATE_MASTERS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('TEMPLATE_MASTERS_TYPE_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java index a3c0cc933..41085af99 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenViewHistoriesDao.java @@ -182,8 +182,13 @@ public ViewHistoriesEntity rawPhysicalInsert(ViewHistoriesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('VIEW_HISTORIES_HISTORY_NO_seq', (select max(HISTORY_NO) from VIEW_HISTORIES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(HISTORY_NO) from VIEW_HISTORIES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('VIEW_HISTORIES_HISTORY_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java index 18f5d4148..66422d11b 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenVotesDao.java @@ -182,8 +182,13 @@ public VotesEntity rawPhysicalInsert(VotesEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('VOTES_VOTE_NO_seq', (select max(VOTE_NO) from VOTES));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(VOTE_NO) from VOTES;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('VOTES_VOTE_NO_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; } diff --git a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java index 9900d3901..4c7d0648b 100644 --- a/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java +++ b/src/main/java/org/support/project/knowledge/dao/gen/GenWebhookConfigsDao.java @@ -182,8 +182,13 @@ public WebhookConfigsEntity rawPhysicalInsert(WebhookConfigsEntity entity) { entity.getDeleteFlag()); String driverClass = ConnectionManager.getInstance().getDriverClass(getConnectionName()); if (ORMappingParameter.DRIVER_NAME_POSTGRESQL.equals(driverClass)) { - String setValSql = "select setval('WEBHOOK_CONFIGS_HOOK_ID_seq', (select max(HOOK_ID) from WEBHOOK_CONFIGS));"; - executeQuerySingle(setValSql, Long.class); + String maxSql = "SELECT MAX(HOOK_ID) from WEBHOOK_CONFIGS;"; + long max = executeQuerySingle(maxSql, Long.class); + if (max < 1) { + max = 1; + } + String setValSql = "SELECT SETVAL('WEBHOOK_CONFIGS_HOOK_ID_seq', ?);"; + executeQuerySingle(setValSql, Long.class, max); } return entity; }