[codeface] Re: [PATCH] Change line endings

  • From: Mitchell Joblin <joblin.m@xxxxxxxxx>
  • To: Wolfgang Mauerer <wolfgang.mauerer@xxxxxxxxxxxxxxxxx>
  • Date: Wed, 7 Oct 2015 15:01:54 +0200

Hi Wolfgang,

On Wed, Oct 7, 2015 at 2:35 PM, Wolfgang Mauerer
<wolfgang.mauerer@xxxxxxxxxxxxxxxxx> wrote:

When did the line endings change, actually? Are they exported
like this from mysql workbench? Might the change be caused
by the recently merged autocrlf patch? If yes, I'd prefer to fix
the line endings issue on this level.

I am not entirely sure what caused the issue, but AFAIK no changes
were made to the datamodel is quite a while so I think it is related
to the patch editing the git attributes file. Basically git would not
allow me to do anything until I commited the file with the new line
endings, even git reset --hard did not accomplish anything. This was
quick fix, if there is a better way to handle this can you please make
a detailed recommendation. I am not familiar with how to correctly
deal with this issue.

Thanks,

Mitchell


Thanks, Wolfgang

Am 07/10/2015 um 14:25 schrieb Mitchell Joblin:
Signed-off-by: Mitchell Joblin <mitchell.joblin.ext@xxxxxxxxxxx>
---
datamodel/codeface_schema.sql | 166
+++++++++++++++++++++---------------------
1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/datamodel/codeface_schema.sql b/datamodel/codeface_schema.sql
index 92859e1..7961e17 100644
--- a/datamodel/codeface_schema.sql
+++ b/datamodel/codeface_schema.sql
@@ -1003,20 +1003,20 @@ DELIMITER ;
DROP VIEW IF EXISTS `codeface`.`revisions_view` ;
DROP TABLE IF EXISTS `codeface`.`revisions_view`;
USE `codeface`;
-CREATE OR REPLACE VIEW `codeface`.`revisions_view` AS
-SELECT
- p.id as projectId,
- rr.id as releaseRangeID,
- rt_s.date as date_start,
- rt_e.date as date_end,
- rt_rs.date as date_rc_start,
- rt_s.tag as tag,
- concat(rt_s.tag,'-',rt_e.tag) as cycle
-FROM
- release_range rr JOIN release_timeline rt_s ON rr.releaseStartId =
rt_s.id
- JOIN release_timeline rt_e ON rr.releaseEndId = rt_e.id
- LEFT JOIN release_timeline rt_rs ON rr.releaseRCStartId = rt_rs.id
- JOIN project p ON rr.projectId = p.id
+CREATE OR REPLACE VIEW `codeface`.`revisions_view` AS
+SELECT
+ p.id as projectId,
+ rr.id as releaseRangeID,
+ rt_s.date as date_start,
+ rt_e.date as date_end,
+ rt_rs.date as date_rc_start,
+ rt_s.tag as tag,
+ concat(rt_s.tag,'-',rt_e.tag) as cycle
+FROM
+ release_range rr JOIN release_timeline rt_s ON rr.releaseStartId =
rt_s.id
+ JOIN release_timeline rt_e ON rr.releaseEndId = rt_e.id
+ LEFT JOIN release_timeline rt_rs ON rr.releaseRCStartId = rt_rs.id
+ JOIN project p ON rr.projectId = p.id
order by rr.id asc;

-- -----------------------------------------------------
@@ -1025,20 +1025,20 @@ order by rr.id asc;
DROP VIEW IF EXISTS `codeface`.`author_commit_stats_view` ;
DROP TABLE IF EXISTS `codeface`.`author_commit_stats_view`;
USE `codeface`;
-CREATE OR REPLACE VIEW `codeface`.`author_commit_stats_view` AS
-SELECT
- p.name as Name,
- s.authorId as ID,
- s.releaseRangeId,
- sum(s.added) as added,
- sum(s.deleted) as deleted,
- sum(s.total) as total,
- sum(s.numcommits) as numcommits
-FROM author_commit_stats s join person p on p.id = s.authorId
-WHERE
-s.authorId IN
- ( select distinct(authorId)
- FROM author_commit_stats)
+CREATE OR REPLACE VIEW `codeface`.`author_commit_stats_view` AS
+SELECT
+ p.name as Name,
+ s.authorId as ID,
+ s.releaseRangeId,
+ sum(s.added) as added,
+ sum(s.deleted) as deleted,
+ sum(s.total) as total,
+ sum(s.numcommits) as numcommits
+FROM author_commit_stats s join person p on p.id = s.authorId
+WHERE
+s.authorId IN
+ ( select distinct(authorId)
+ FROM author_commit_stats)
GROUP BY s.authorId, p.name, s.releaseRangeId;

-- -----------------------------------------------------
@@ -1047,27 +1047,27 @@ GROUP BY s.authorId, p.name, s.releaseRangeId;
DROP VIEW IF EXISTS `codeface`.`per_person_cluster_statistics_view` ;
DROP TABLE IF EXISTS `codeface`.`per_person_cluster_statistics_view`;
USE `codeface`;
-CREATE OR REPLACE VIEW `codeface`.`per_person_cluster_statistics_view` AS
-select
- rr.projectId as 'projectId',
- rr.id as 'releaseRangeId',
- c.id as 'clusterId',
- p.id as 'personId',
- pr.technique as 'technique',
- prm.rankValue as 'rankValue',
- sum(acs.added) as 'added',
- sum(acs.deleted) as 'deleted',
- sum(acs.total) as 'total',
- sum(acs.numcommits) as 'numcommits'
-from release_range rr INNER JOIN (cluster c, cluster_user_mapping cum,
person p, author_commit_stats acs, pagerank pr, pagerank_matrix prm)
- ON (rr.id = c.releaseRangeId
- AND c.id = cum.clusterId
- AND cum.personId = p.id
- AND rr.id = acs.releaseRangeId
- AND p.id = acs.authorId
- AND rr.id = pr.releaseRangeID
- AND pr.id = prm.pageRankId
- AND p.id = prm.personId)
+CREATE OR REPLACE VIEW `codeface`.`per_person_cluster_statistics_view` AS
+select
+ rr.projectId as 'projectId',
+ rr.id as 'releaseRangeId',
+ c.id as 'clusterId',
+ p.id as 'personId',
+ pr.technique as 'technique',
+ prm.rankValue as 'rankValue',
+ sum(acs.added) as 'added',
+ sum(acs.deleted) as 'deleted',
+ sum(acs.total) as 'total',
+ sum(acs.numcommits) as 'numcommits'
+from release_range rr INNER JOIN (cluster c, cluster_user_mapping cum,
person p, author_commit_stats acs, pagerank pr, pagerank_matrix prm)
+ ON (rr.id = c.releaseRangeId
+ AND c.id = cum.clusterId
+ AND cum.personId = p.id
+ AND rr.id = acs.releaseRangeId
+ AND p.id = acs.authorId
+ AND rr.id = pr.releaseRangeID
+ AND pr.id = prm.pageRankId
+ AND p.id = prm.personId)
group by rr.projectId , rr.id , c.id , p.id, pr.technique, prm.rankValue;

-- -----------------------------------------------------
@@ -1076,19 +1076,19 @@ group by rr.projectId , rr.id , c.id , p.id,
pr.technique, prm.rankValue;
DROP VIEW IF EXISTS `codeface`.`cluster_user_pagerank_view` ;
DROP TABLE IF EXISTS `codeface`.`cluster_user_pagerank_view`;
USE `codeface`;
-CREATE OR REPLACE VIEW `codeface`.`cluster_user_pagerank_view` AS
-SELECT
- cum.id,
- cum.personId,
- cum.clusterId AS clusterId,
- pr.technique,
- prm.rankValue
-FROM
- cluster_user_mapping cum
- INNER JOIN (cluster c, pagerank_matrix prm, pagerank pr)
- ON (cum.personId = prm.personId AND
- cum.clusterId = c.id AND
- prm.pageRankId = pr.id AND
+CREATE OR REPLACE VIEW `codeface`.`cluster_user_pagerank_view` AS
+SELECT
+ cum.id,
+ cum.personId,
+ cum.clusterId AS clusterId,
+ pr.technique,
+ prm.rankValue
+FROM
+ cluster_user_mapping cum
+ INNER JOIN (cluster c, pagerank_matrix prm, pagerank pr)
+ ON (cum.personId = prm.personId AND
+ cum.clusterId = c.id AND
+ prm.pageRankId = pr.id AND
c.releaseRangeId = pr.releaseRangeId);

-- -----------------------------------------------------
@@ -1097,27 +1097,27 @@ FROM
DROP VIEW IF EXISTS `codeface`.`per_cluster_statistics_view` ;
DROP TABLE IF EXISTS `codeface`.`per_cluster_statistics_view`;
USE `codeface`;
-CREATE OR REPLACE VIEW `codeface`.`per_cluster_statistics_view` AS
-select
- rr.projectId as 'projectId',
- rr.id as 'releaseRangeId',
- c.id as 'clusterId',
- pr.technique,
- count(p.id) as 'num_members',
- sum(acs.added) as 'added',
- sum(acs.deleted) as 'deleted',
- sum(acs.total) as 'total',
- sum(acs.numcommits) as 'numcommits',
- avg(prm.rankValue) as 'prank_avg'
-from release_range rr INNER JOIN (cluster c, cluster_user_mapping cum,
person p, author_commit_stats acs, pagerank pr, pagerank_matrix prm)
- ON (rr.id = c.releaseRangeId
- AND c.id = cum.clusterId
- AND cum.personId = p.id
- AND rr.id = acs.releaseRangeId
- AND p.id = acs.authorId
- AND rr.id = pr.releaseRangeID
- AND pr.id = prm.pageRankId
- AND p.id = prm.personId)
+CREATE OR REPLACE VIEW `codeface`.`per_cluster_statistics_view` AS
+select
+ rr.projectId as 'projectId',
+ rr.id as 'releaseRangeId',
+ c.id as 'clusterId',
+ pr.technique,
+ count(p.id) as 'num_members',
+ sum(acs.added) as 'added',
+ sum(acs.deleted) as 'deleted',
+ sum(acs.total) as 'total',
+ sum(acs.numcommits) as 'numcommits',
+ avg(prm.rankValue) as 'prank_avg'
+from release_range rr INNER JOIN (cluster c, cluster_user_mapping cum,
person p, author_commit_stats acs, pagerank pr, pagerank_matrix prm)
+ ON (rr.id = c.releaseRangeId
+ AND c.id = cum.clusterId
+ AND cum.personId = p.id
+ AND rr.id = acs.releaseRangeId
+ AND p.id = acs.authorId
+ AND rr.id = pr.releaseRangeID
+ AND pr.id = prm.pageRankId
+ AND p.id = prm.personId)
group by rr.projectId , rr.id , c.id, pr.technique;

-- -----------------------------------------------------


Other related posts: