You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by na...@apache.org on 2016/11/22 13:15:08 UTC
[1/3] incubator-fineract git commit: Fix for resolving scorecards,
and replacing dead fk relation
Repository: incubator-fineract
Updated Branches:
refs/heads/develop 8cc4b6e4f -> aac5ae0d4
Fix for resolving scorecards, and replacing dead fk relation
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/0a4dc11a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/0a4dc11a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/0a4dc11a
Branch: refs/heads/develop
Commit: 0a4dc11a8783925177a7944cb796c66bedfeaa96
Parents: e79d51e
Author: Markus Geiss <mg...@mifos.org>
Authored: Fri Nov 18 14:29:25 2016 +0100
Committer: Markus Geiss <mg...@mifos.org>
Committed: Fri Nov 18 14:29:25 2016 +0100
----------------------------------------------------------------------
.../fineract/spm/api/ScorecardApiResource.java | 4 +-
...__spm_replace_dead_fk_with_exisiting_one.sql | 49 ++++++++++++++++++++
2 files changed, 51 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/0a4dc11a/fineract-provider/src/main/java/org/apache/fineract/spm/api/ScorecardApiResource.java
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/java/org/apache/fineract/spm/api/ScorecardApiResource.java b/fineract-provider/src/main/java/org/apache/fineract/spm/api/ScorecardApiResource.java
index 9c4ed7d..84987da 100644
--- a/fineract-provider/src/main/java/org/apache/fineract/spm/api/ScorecardApiResource.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/spm/api/ScorecardApiResource.java
@@ -76,7 +76,7 @@ public class ScorecardApiResource {
final List<Scorecard> scorecards = this.scorecardService.findBySurvey(survey);
- if (scorecards == null) {
+ if (scorecards != null) {
return ScorecardMapper.map(scorecards);
}
@@ -105,7 +105,7 @@ public class ScorecardApiResource {
final Survey survey = findSurvey(surveyId);
final Client client = this.clientRepositoryWrapper.findOneWithNotFoundDetection(clientId);
final List<Scorecard> scorecards = this.scorecardService.findBySurveyAndClient(survey, client);
- if (scorecards == null) {
+ if (scorecards != null) {
return ScorecardMapper.map(scorecards);
}
return Collections.EMPTY_LIST;
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/0a4dc11a/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql b/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
new file mode 100644
index 0000000..06b880e
--- /dev/null
+++ b/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
@@ -0,0 +1,49 @@
+--
+-- Licensed to the Apache Software Foundation (ASF) under one
+-- or more contributor license agreements. See the NOTICE file
+-- distributed with this work for additional information
+-- regarding copyright ownership. The ASF licenses this file
+-- to you under the Apache License, Version 2.0 (the
+-- "License"); you may not use this file except in compliance
+-- with the License. You may obtain a copy of the License at
+--
+-- http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing,
+-- software distributed under the License is distributed on an
+-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-- KIND, either express or implied. See the License for the
+-- specific language governing permissions and limitations
+-- under the License.
+--
+
+DROP PROCEDURE IF EXISTS remove_anonymous_fk;
+
+DELIMITER $$
+
+CREATE PROCEDURE remove_anonymous_fk (IN referencee VARCHAR(255), IN referenced VARCHAR(255))
+ BEGIN
+ DECLARE fk2drop VARCHAR(255);
+
+ SELECT
+ CONSTRAINT_NAME
+ FROM
+ INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+ WHERE
+ TABLE_NAME = referencee
+ AND REFERENCED_TABLE_NAME = referenced
+ INTO fk2drop;
+
+ SET @alter_stmt = concat('ALTER TABLE ',referencee,' DROP FOREIGN KEY ',fk2drop);
+ PREPARE pstmt FROM @alter_stmt;
+ EXECUTE pstmt;
+ DEALLOCATE PREPARE pstmt;
+ END $$
+
+DELIMITER ;
+
+CALL remove_anonymous_fk('m_survey_scorecards', 'm_appusers');
+
+ALTER TABLE `m_survey_scorecards` ADD FOREIGN KEY `m_appuser` (`user_id`);
+
+DROP PROCEDURE IF EXISTS remove_anonymous_fk;
[3/3] incubator-fineract git commit: Dropping m_survey_scorecardsa
and recreating it with correct foreign key relation
Posted by na...@apache.org.
Dropping m_survey_scorecardsa and recreating it with correct foreign key relation
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/aac5ae0d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/aac5ae0d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/aac5ae0d
Branch: refs/heads/develop
Commit: aac5ae0d483db13e186816f460d4d797eee1fb36
Parents: 1bfb0b9
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Tue Nov 22 18:01:02 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Tue Nov 22 18:01:02 2016 +0530
----------------------------------------------------------------------
...__spm_replace_dead_fk_with_exisiting_one.sql | 49 ++++++++------------
1 file changed, 19 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/aac5ae0d/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
----------------------------------------------------------------------
diff --git a/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql b/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
index 06b880e..405515f 100644
--- a/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
+++ b/fineract-provider/src/main/resources/sql/migrations/core_db/V323__spm_replace_dead_fk_with_exisiting_one.sql
@@ -17,33 +17,22 @@
-- under the License.
--
-DROP PROCEDURE IF EXISTS remove_anonymous_fk;
-
-DELIMITER $$
-
-CREATE PROCEDURE remove_anonymous_fk (IN referencee VARCHAR(255), IN referenced VARCHAR(255))
- BEGIN
- DECLARE fk2drop VARCHAR(255);
-
- SELECT
- CONSTRAINT_NAME
- FROM
- INFORMATION_SCHEMA.KEY_COLUMN_USAGE
- WHERE
- TABLE_NAME = referencee
- AND REFERENCED_TABLE_NAME = referenced
- INTO fk2drop;
-
- SET @alter_stmt = concat('ALTER TABLE ',referencee,' DROP FOREIGN KEY ',fk2drop);
- PREPARE pstmt FROM @alter_stmt;
- EXECUTE pstmt;
- DEALLOCATE PREPARE pstmt;
- END $$
-
-DELIMITER ;
-
-CALL remove_anonymous_fk('m_survey_scorecards', 'm_appusers');
-
-ALTER TABLE `m_survey_scorecards` ADD FOREIGN KEY `m_appuser` (`user_id`);
-
-DROP PROCEDURE IF EXISTS remove_anonymous_fk;
+SET FOREIGN_KEY_CHECKS = 0;
+DROP TABLE IF EXISTS `m_survey_scorecards`;
+CREATE TABLE `m_survey_scorecards` (
+ `id` BIGINT(20) NOT NULL AUTO_INCREMENT,
+ `survey_id` BIGINT(20) NOT NULL,
+ `question_id` BIGINT(20) NOT NULL,
+ `response_id` BIGINT(20) NOT NULL,
+ `user_id` BIGINT(20) NOT NULL,
+ `client_id` BIGINT(20) NOT NULL,
+ `created_on` DATETIME NULL DEFAULT NULL,
+ `a_value` INT(4) NOT NULL,
+ PRIMARY KEY (`id`),
+ FOREIGN KEY (`survey_id`) REFERENCES `m_surveys` (`id`),
+ FOREIGN KEY (`question_id`) REFERENCES `m_survey_questions` (`id`),
+ FOREIGN KEY (`response_id`) REFERENCES `m_survey_responses` (`id`),
+ FOREIGN KEY (`user_id`) REFERENCES `m_appuser` (`id`),
+ FOREIGN KEY (`client_id`) REFERENCES `m_client` (`id`)
+);
+SET FOREIGN_KEY_CHECKS = 1;
[2/3] incubator-fineract git commit: Merge branch 'PR248' into develop
Posted by na...@apache.org.
Merge branch 'PR248' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/1bfb0b97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/1bfb0b97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/1bfb0b97
Branch: refs/heads/develop
Commit: 1bfb0b97cb1293e07822e316c48fd1dd224eee2c
Parents: 8cc4b6e 0a4dc11
Author: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Authored: Tue Nov 22 17:55:25 2016 +0530
Committer: Nazeer Hussain Shaik <na...@confluxtechnologies.com>
Committed: Tue Nov 22 17:55:25 2016 +0530
----------------------------------------------------------------------
.../fineract/spm/api/ScorecardApiResource.java | 4 +-
...__spm_replace_dead_fk_with_exisiting_one.sql | 49 ++++++++++++++++++++
2 files changed, 51 insertions(+), 2 deletions(-)
----------------------------------------------------------------------