From 5c0b5197da16f77786ea0d671e1ff1ea4e3b3518 Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 11 Jul 2012 17:08:23 +0200 Subject: [PATCH] SONAR-3645 remove useless jdbc types in MyBatis mappers --- .../ActiveDashboardMapper-oracle.xml | 2 +- .../core/dashboard/ActiveDashboardMapper.xml | 2 +- .../core/dashboard/DashboardMapper-oracle.xml | 4 +-- .../sonar/core/dashboard/DashboardMapper.xml | 4 +-- .../core/dashboard/WidgetMapper-oracle.xml | 4 +-- .../org/sonar/core/dashboard/WidgetMapper.xml | 4 +-- .../dashboard/WidgetPropertyMapper-oracle.xml | 2 +- .../core/dashboard/WidgetPropertyMapper.xml | 2 +- .../core/filter/CriterionMapper-oracle.xml | 2 +- .../org/sonar/core/filter/CriterionMapper.xml | 4 +-- .../core/filter/FilterColumnMapper-oracle.xml | 4 +-- .../sonar/core/filter/FilterColumnMapper.xml | 4 +-- .../sonar/core/filter/FilterMapper-oracle.xml | 4 +-- .../org/sonar/core/filter/FilterMapper.xml | 4 +-- .../properties/PropertiesMapper-oracle.xml | 4 +-- .../core/properties/PropertiesMapper.xml | 4 +-- .../resource/ResourceIndexerMapper-oracle.xml | 4 +-- .../core/resource/ResourceIndexerMapper.xml | 4 +-- .../resource/ResourceKeyUpdaterMapper.xml | 2 +- .../core/resource/ResourceMapper-oracle.xml | 14 +++++----- .../sonar/core/resource/ResourceMapper.xml | 14 +++++----- .../review/ReviewCommentMapper-oracle.xml | 4 +-- .../sonar/core/review/ReviewCommentMapper.xml | 4 +-- .../org/sonar/core/review/ReviewMapper.xml | 28 +++++++++---------- .../sonar/core/user/AuthorMapper-oracle.xml | 4 +-- .../org/sonar/core/user/AuthorMapper.xml | 4 +-- .../org/sonar/core/user/RoleMapper-oracle.xml | 4 +-- .../org/sonar/core/user/RoleMapper.xml | 4 +-- 28 files changed, 72 insertions(+), 72 deletions(-) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper-oracle.xml index 726c84afbc0..4c6acb65218 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/ActiveDashboardMapper-oracle.xml @@ -8,7 +8,7 @@ select active_dashboards_seq.NEXTVAL from DUAL INSERT INTO active_dashboards (id, dashboard_id, user_id, order_index) - VALUES (#{id}, #{dashboardId}, #{userId, jdbcType=FLOAT}, #{orderIndex}) + VALUES (#{id}, #{dashboardId}, #{userId}, #{orderIndex}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml index c31679db232..6be6dbaa326 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper-oracle.xml @@ -13,8 +13,8 @@ select dashboards_seq.NEXTVAL from DUAL INSERT INTO dashboards (id, user_id, name, description, column_layout, shared, is_global, created_at, updated_at) - VALUES (#{id}, #{userId, jdbcType=FLOAT}, #{name, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, - #{columnLayout, jdbcType=INTEGER}, #{shared}, #{global}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + VALUES (#{id}, #{userId}, #{name}, #{description}, + #{columnLayout}, #{shared}, #{global}, #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml index 00e32a3785f..8fceb2402ac 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/DashboardMapper.xml @@ -10,8 +10,8 @@ INSERT INTO dashboards (user_id, name, description, column_layout, shared, is_global, created_at, updated_at) - VALUES (#{userId, jdbcType=FLOAT}, #{name, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, - #{columnLayout, jdbcType=INTEGER}, #{shared}, #{global}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + VALUES (#{userId}, #{name}, #{description}, + #{columnLayout}, #{shared}, #{global}, #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper-oracle.xml index 1cb58c0ab3b..28eb783b122 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper-oracle.xml @@ -8,8 +8,8 @@ select widgets_seq.NEXTVAL from DUAL INSERT INTO widgets (id, dashboard_id, widget_key, name, description, column_index, row_index, configured, created_at, updated_at, resource_id) - VALUES (#{id}, #{dashboardId}, #{key}, #{name, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{columnIndex, jdbcType=INTEGER}, - #{rowIndex, jdbcType=INTEGER}, #{configured}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}, #{resourceId, jdbcType=INTEGER}) + VALUES (#{id}, #{dashboardId}, #{key}, #{name}, #{description}, #{columnIndex}, + #{rowIndex}, #{configured}, #{createdAt}, #{updatedAt}, #{resourceId}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml index c9e42294df8..4f60fdc364e 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetMapper.xml @@ -5,8 +5,8 @@ INSERT INTO widgets (dashboard_id, widget_key, name, description, column_index, row_index, configured, created_at, updated_at, resource_id) - VALUES (#{dashboardId}, #{key}, #{name, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{columnIndex, jdbcType=INTEGER}, - #{rowIndex, jdbcType=INTEGER}, #{configured}, #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}, #{resourceId, jdbcType=INTEGER}) + VALUES (#{dashboardId}, #{key}, #{name}, #{description}, #{columnIndex}, + #{rowIndex}, #{configured}, #{createdAt}, #{updatedAt}, #{resourceId}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper-oracle.xml index 4bf30699d67..2d149bbff85 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper-oracle.xml @@ -5,7 +5,7 @@ INSERT INTO widget_properties (id, widget_id, kee, text_value) - VALUES (widget_properties_seq.NEXTVAL, #{widgetId}, #{key, jdbcType=VARCHAR}, #{value, jdbcType=VARCHAR}) + VALUES (widget_properties_seq.NEXTVAL, #{widgetId}, #{key}, #{value}) diff --git a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml index 99abdec67f0..73b9156029d 100644 --- a/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/dashboard/WidgetPropertyMapper.xml @@ -5,7 +5,7 @@ INSERT INTO widget_properties (widget_id, kee, text_value) - VALUES (#{widgetId}, #{key, jdbcType=VARCHAR}, #{value, jdbcType=VARCHAR}) + VALUES (#{widgetId}, #{key}, #{value}) diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml index a3fdba73042..1196f6d0fac 100644 --- a/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper-oracle.xml @@ -8,7 +8,7 @@ select criteria_seq.NEXTVAL from DUAL INSERT INTO criteria (id, filter_id, family, kee, operator, value, text_value, variation) - VALUES (#{id}, #{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{operator, jdbcType=VARCHAR}, #{value, jdbcType=FLOAT}, #{textValue, jdbcType=VARCHAR}, #{variation}) + VALUES (#{id}, #{filterId}, #{family}, #{key}, #{operator}, #{value}, #{textValue}, #{variation}) diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper.xml b/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper.xml index 09c4769e9f8..e90aa337774 100644 --- a/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/filter/CriterionMapper.xml @@ -5,8 +5,8 @@ INSERT INTO criteria (filter_id, family, kee, operator, value, text_value, variation) - VALUES (#{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{operator, jdbcType=VARCHAR}, #{value, jdbcType=FLOAT}, - #{textValue, jdbcType=VARCHAR}, #{variation}) + VALUES (#{filterId}, #{family}, #{key}, #{operator}, #{value}, + #{textValue}, #{variation}) diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml index 87a7212219f..37fb49c777d 100644 --- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper-oracle.xml @@ -8,8 +8,8 @@ select filter_columns_seq.NEXTVAL from DUAL INSERT INTO filter_columns (id, filter_id, family, kee, sort_direction, order_index, variation) - VALUES (#{id}, #{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{sortDirection, jdbcType=VARCHAR}, - #{orderIndex, jdbcType=INTEGER}, #{variation}) + VALUES (#{id}, #{filterId}, #{family}, #{key}, #{sortDirection}, + #{orderIndex}, #{variation}) diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper.xml index a7f71467f14..c1d01509dda 100644 --- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterColumnMapper.xml @@ -5,8 +5,8 @@ INSERT INTO filter_columns (filter_id, family, kee, sort_direction, order_index, variation) - VALUES (#{filterId, jdbcType=INTEGER}, #{family, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{sortDirection, jdbcType=VARCHAR}, - #{orderIndex, jdbcType=INTEGER}, #{variation}) + VALUES (#{filterId}, #{family}, #{key}, #{sortDirection}, + #{orderIndex}, #{variation}) diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml index 7a2c3772964..9235b437a7f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper-oracle.xml @@ -13,8 +13,8 @@ select filters_seq.NEXTVAL from DUAL INSERT INTO filters (id, name, kee, user_id, shared, favourites, resource_id, default_view, page_size, period_index) - VALUES (#{id}, #{name, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{userId, jdbcType=FLOAT}, #{shared}, #{favourites}, #{resourceId, jdbcType=INTEGER}, #{defaultView, jdbcType=VARCHAR}, - #{pageSize, jdbcType=INTEGER}, #{periodIndex, jdbcType=INTEGER}) + VALUES (#{id}, #{name}, #{key}, #{userId}, #{shared}, #{favourites}, #{resourceId}, #{defaultView}, + #{pageSize}, #{periodIndex}) diff --git a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml index 41aa28f855e..782a76c67c4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/filter/FilterMapper.xml @@ -10,8 +10,8 @@ INSERT INTO filters (name, kee, user_id, shared, favourites, resource_id, default_view, page_size, period_index) - VALUES (#{name, jdbcType=VARCHAR}, #{key, jdbcType=VARCHAR}, #{userId, jdbcType=FLOAT}, #{shared}, #{favourites}, #{resourceId, jdbcType=INTEGER}, #{defaultView, jdbcType=VARCHAR}, - #{pageSize, jdbcType=INTEGER}, #{periodIndex, jdbcType=INTEGER}) + VALUES (#{name}, #{key}, #{userId}, #{shared}, #{favourites}, #{resourceId}, #{defaultView}, + #{pageSize}, #{periodIndex}) diff --git a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper-oracle.xml index 75b1c884fe1..3f7d6add7b0 100644 --- a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper-oracle.xml @@ -47,7 +47,7 @@ - update properties set text_value = #{value, jdbcType=VARCHAR} where id = #{id} + update properties set text_value = #{value} where id = #{id} @@ -55,7 +55,7 @@ select properties_seq.NEXTVAL from DUAL INSERT INTO properties (id, prop_key, resource_id, user_id, text_value) - VALUES (#{id}, #{key, jdbcType=VARCHAR}, #{resourceId, jdbcType=INTEGER}, #{userId, jdbcType=INTEGER}, #{value, jdbcType=VARCHAR}) + VALUES (#{id}, #{key}, #{resourceId}, #{userId}, #{value}) diff --git a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml b/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml index 84858c1fcaa..78b22358d0b 100644 --- a/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/properties/PropertiesMapper.xml @@ -47,12 +47,12 @@ - update properties set text_value = #{value, jdbcType=VARCHAR} where id = #{id} + update properties set text_value = #{value} where id = #{id} INSERT INTO properties (prop_key, resource_id, user_id, text_value) - VALUES (#{key, jdbcType=VARCHAR}, #{resourceId, jdbcType=INTEGER}, #{userId, jdbcType=INTEGER}, #{value, jdbcType=VARCHAR}) + VALUES (#{key}, #{resourceId}, #{userId}, #{value}) diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper-oracle.xml index 033e59fd0ec..f128b550999 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper-oracle.xml @@ -63,8 +63,8 @@ select resource_index_seq.NEXTVAL from DUAL insert into resource_index (id, kee, position, name_size, resource_id, root_project_id, qualifier) - values (#{id}, #{key, jdbcType=VARCHAR}, #{position, jdbcType=INTEGER}, #{nameSize, jdbcType=INTEGER}, - #{resourceId, jdbcType=BIGINT}, #{rootProjectId, jdbcType=BIGINT}, #{qualifier, jdbcType=VARCHAR}) + values (#{id}, #{key}, #{position}, #{nameSize}, + #{resourceId}, #{rootProjectId}, #{qualifier}) diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml index faf58386640..33cb98db059 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceIndexerMapper.xml @@ -60,8 +60,8 @@ insert into resource_index (kee, position, name_size, resource_id, root_project_id, qualifier) - values (#{key, jdbcType=VARCHAR}, #{position, jdbcType=INTEGER}, #{nameSize, jdbcType=INTEGER}, - #{resourceId, jdbcType=BIGINT}, #{rootProjectId, jdbcType=BIGINT}, #{qualifier, jdbcType=VARCHAR}) + values (#{key}, #{position}, #{nameSize}, + #{resourceId}, #{rootProjectId}, #{qualifier}) diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceKeyUpdaterMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceKeyUpdaterMapper.xml index 2fc0a3f4231..3995965d6c2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceKeyUpdaterMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceKeyUpdaterMapper.xml @@ -30,7 +30,7 @@ update projects - set kee = #{key, jdbcType=VARCHAR} + set kee = #{key} where id = #{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper-oracle.xml index b2be3b7858d..4f8ff7a8d1a 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper-oracle.xml @@ -90,17 +90,17 @@ insert into projects (id, name, long_name, description, scope, qualifier, kee, language, root_id, copy_resource_id, person_id, profile_id, enabled) values ( - #{id}, #{name, jdbcType=VARCHAR}, #{longName, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{scope, jdbcType=VARCHAR}, #{qualifier, jdbcType=VARCHAR}, - #{key, jdbcType=VARCHAR}, #{language, jdbcType=VARCHAR}, #{rootId, jdbcType=INTEGER}, #{copyResourceId, jdbcType=INTEGER}, - #{personId, jdbcType=INTEGER}, #{profileId, jdbcType=INTEGER}, #{enabled, jdbcType=BOOLEAN} + #{id}, #{name}, #{longName}, #{description}, #{scope}, #{qualifier}, + #{key}, #{language}, #{rootId}, #{copyResourceId}, + #{personId}, #{profileId}, #{enabled} ) - update projects set name=#{name, jdbcType=VARCHAR}, long_name=#{longName, jdbcType=VARCHAR}, description=#{description, jdbcType=VARCHAR}, - scope=#{scope, jdbcType=VARCHAR}, qualifier=#{qualifier, jdbcType=VARCHAR}, kee=#{key, jdbcType=VARCHAR}, - language=#{language, jdbcType=VARCHAR}, root_id=#{rootId, jdbcType=INTEGER}, copy_resource_id=#{copyResourceId, jdbcType=INTEGER}, - person_id=#{personId, jdbcType=INTEGER}, profile_id=#{profileId, jdbcType=INTEGER}, enabled=#{enabled, jdbcType=BOOLEAN} where id=#{id,jdbcType=INTEGER} + update projects set name=#{name}, long_name=#{longName}, description=#{description}, + scope=#{scope}, qualifier=#{qualifier}, kee=#{key}, + language=#{language}, root_id=#{rootId}, copy_resource_id=#{copyResourceId}, + person_id=#{personId}, profile_id=#{profileId}, enabled=#{enabled} where id=#{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml index 728cb9dda0f..2f4fc2735e2 100644 --- a/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/resource/ResourceMapper.xml @@ -87,17 +87,17 @@ insert into projects (name, long_name, description, scope, qualifier, kee, language, root_id, copy_resource_id, person_id, profile_id, enabled) values ( - #{name, jdbcType=VARCHAR}, #{longName, jdbcType=VARCHAR}, #{description, jdbcType=VARCHAR}, #{scope, jdbcType=VARCHAR}, #{qualifier, jdbcType=VARCHAR}, - #{key, jdbcType=VARCHAR}, #{language, jdbcType=VARCHAR}, #{rootId, jdbcType=INTEGER}, #{copyResourceId, jdbcType=INTEGER}, - #{personId, jdbcType=INTEGER}, #{profileId, jdbcType=INTEGER}, #{enabled, jdbcType=BOOLEAN} + #{name}, #{longName}, #{description}, #{scope}, #{qualifier}, + #{key}, #{language}, #{rootId}, #{copyResourceId}, + #{personId}, #{profileId}, #{enabled} ) - update projects set name=#{name, jdbcType=VARCHAR}, long_name=#{longName, jdbcType=VARCHAR}, description=#{description, jdbcType=VARCHAR}, - scope=#{scope, jdbcType=VARCHAR}, qualifier=#{qualifier, jdbcType=VARCHAR}, kee=#{key, jdbcType=VARCHAR}, - language=#{language, jdbcType=VARCHAR}, root_id=#{rootId, jdbcType=INTEGER}, copy_resource_id=#{copyResourceId, jdbcType=INTEGER}, - person_id=#{personId, jdbcType=INTEGER}, profile_id=#{profileId, jdbcType=INTEGER}, enabled=#{enabled, jdbcType=BOOLEAN} where id=#{id,jdbcType=INTEGER} + update projects set name=#{name}, long_name=#{longName}, description=#{description}, + scope=#{scope}, qualifier=#{qualifier}, kee=#{key}, + language=#{language}, root_id=#{rootId}, copy_resource_id=#{copyResourceId}, + person_id=#{personId}, profile_id=#{profileId}, enabled=#{enabled} where id=#{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper-oracle.xml index adcd357a9a8..d6bf54dfe63 100644 --- a/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper-oracle.xml @@ -8,8 +8,8 @@ select review_comments_seq.NEXTVAL from DUAL INSERT INTO review_comments (id, review_id, user_id, review_text, created_at, updated_at) - VALUES (#{id}, #{reviewId, jdbcType=BIGINT}, #{userId, jdbcType=BIGINT}, #{text, jdbcType=VARCHAR}, - #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + VALUES (#{id}, #{reviewId}, #{userId}, #{text}, + #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper.xml b/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper.xml index 96a3111f7c1..3fc4f19c9a4 100644 --- a/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/review/ReviewCommentMapper.xml @@ -5,8 +5,8 @@ INSERT INTO review_comments (review_id, user_id, review_text, created_at, updated_at) - VALUES (#{reviewId, jdbcType=BIGINT}, #{userId, jdbcType=BIGINT}, #{text, jdbcType=VARCHAR}, - #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + VALUES (#{reviewId}, #{userId}, #{text}, + #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/review/ReviewMapper.xml b/sonar-core/src/main/resources/org/sonar/core/review/ReviewMapper.xml index 733491de31e..b9f400d5d30 100644 --- a/sonar-core/src/main/resources/org/sonar/core/review/ReviewMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/review/ReviewMapper.xml @@ -24,22 +24,22 @@ update reviews set - created_at=#{createdAt, jdbcType=TIMESTAMP}, - updated_at=#{updatedAt, jdbcType=TIMESTAMP}, - user_id=#{userId, jdbcType=INTEGER}, - assignee_id=#{assigneeId, jdbcType=INTEGER}, - status=#{status, jdbcType=VARCHAR}, - resolution=#{resolution, jdbcType=VARCHAR}, - title=#{title, jdbcType=VARCHAR}, - severity=#{severity, jdbcType=VARCHAR}, - rule_failure_permanent_id=#{violationPermanentId, jdbcType=INTEGER}, - project_id=#{projectId, jdbcType=INTEGER}, - resource_id=#{resourceId, jdbcType=INTEGER}, - resource_line=#{line, jdbcType=INTEGER}, - rule_id=#{ruleId, jdbcType=INTEGER}, + created_at=#{createdAt}, + updated_at=#{updatedAt}, + user_id=#{userId}, + assignee_id=#{assigneeId}, + status=#{status}, + resolution=#{resolution}, + title=#{title}, + severity=#{severity}, + rule_failure_permanent_id=#{violationPermanentId}, + project_id=#{projectId}, + resource_id=#{resourceId}, + resource_line=#{line}, + rule_id=#{ruleId}, manual_severity=#{manualSeverity}, manual_violation=#{manualViolation}, - data=#{data, jdbcType=VARCHAR} + data=#{data} where id = #{id} diff --git a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper-oracle.xml index ab99f615cf7..e0b191c4a88 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper-oracle.xml @@ -18,8 +18,8 @@ select authors_seq.NEXTVAL from DUAL INSERT INTO authors (id, person_id, login, created_at, updated_at) - VALUES (#{id}, #{personId, jdbcType=INTEGER}, #{login, jdbcType=VARCHAR}, - #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + VALUES (#{id}, #{personId}, #{login}, + #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml b/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml index dd8dadac0de..96e1959845f 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/user/AuthorMapper.xml @@ -15,8 +15,8 @@ INSERT INTO authors (person_id, login, created_at, updated_at) - VALUES (#{personId, jdbcType=INTEGER}, #{login, jdbcType=VARCHAR}, - #{createdAt, jdbcType=TIMESTAMP}, #{updatedAt, jdbcType=TIMESTAMP}) + VALUES (#{personId}, #{login}, + #{createdAt}, #{updatedAt}) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper-oracle.xml b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper-oracle.xml index e77b822bcef..996fc4fb4d5 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper-oracle.xml +++ b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper-oracle.xml @@ -8,7 +8,7 @@ select group_roles_seq.NEXTVAL from DUAL INSERT INTO group_roles (id, group_id, resource_id, role) - VALUES (#{id}, #{groupId, jdbcType=INTEGER}, #{resourceId, jdbcType=INTEGER}, #{role, jdbcType=VARCHAR}) + VALUES (#{id}, #{groupId}, #{resourceId}, #{role}) @@ -16,7 +16,7 @@ select user_roles_seq.NEXTVAL from DUAL INSERT INTO user_roles (id, user_id, resource_id, role) - VALUES (#{id}, #{userId, jdbcType=INTEGER}, #{resourceId, jdbcType=INTEGER}, #{role, jdbcType=VARCHAR}) + VALUES (#{id}, #{userId}, #{resourceId}, #{role}) diff --git a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml index be2fad12465..d553b81ae46 100644 --- a/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml +++ b/sonar-core/src/main/resources/org/sonar/core/user/RoleMapper.xml @@ -5,12 +5,12 @@ INSERT INTO group_roles (group_id, resource_id, role) - VALUES (#{groupId, jdbcType=INTEGER}, #{resourceId, jdbcType=INTEGER}, #{role, jdbcType=VARCHAR}) + VALUES (#{groupId}, #{resourceId}, #{role}) INSERT INTO user_roles (user_id, resource_id, role) - VALUES (#{userId, jdbcType=INTEGER}, #{resourceId, jdbcType=INTEGER}, #{role, jdbcType=VARCHAR}) + VALUES (#{userId}, #{resourceId}, #{role}) -- 2.39.5