[mb-commits] branch, beta, updated. Merge branch 'mbs-5652-rg-label-sorting' into beta MBS-5652: linebreaks MBS-5...

The branch, beta has been updated
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=48dff89585a1e0b874458fec045f09d6b94feb7c (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=cd0b3bf100972a86231ebdd7d1a5ec0f38795aba (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=b20f9c0de55d38c9947f5f4b5e956f3d75091fbc (commit)
       via  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=aacc19dab4621b78593964cf6a11f4d9d952b179 (commit)
      from  http://git.musicbrainz.org/gitweb/?p=musicbrainz-server/core.git;a=commit;h=51cf45f3ebbc5fe068aae858f8b2ce6174ade910 (commit)

Summary of changes:
 lib/MusicBrainz/Server/Data/ReleaseLabel.pm |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 48dff89585a1e0b874458fec045f09d6b94feb7c
Merge: 51cf45f cd0b3bf
Author: Ian McEwen <[email protected]>
Date:   Tue Jan 15 13:20:11 2013 -0700

    Merge branch 'mbs-5652-rg-label-sorting' into beta
    
    * mbs-5652-rg-label-sorting:
      MBS-5652: linebreaks
      MBS-5652: Switch to using the label's sortname
      MBS-5652: sort labels when loaded by ReleaseLabel by the label ID after the catalog number


commit cd0b3bf100972a86231ebdd7d1a5ec0f38795aba
Author: Ian McEwen <[email protected]>
Date:   Fri Jan 11 09:33:49 2013 -0700

    MBS-5652: linebreaks

diff --git a/lib/MusicBrainz/Server/Data/ReleaseLabel.pm b/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
index f11d8ee..15d157c 100644
--- a/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
+++ b/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
@@ -47,7 +47,9 @@ sub load
     my @ids = keys %id_to_release;
     return unless @ids; # nothing to do
     my $query = "SELECT " . $self->_columns . "
-                 FROM " . $self->_table . " JOIN label ON rl.label = label.id JOIN label_name sort_name ON label.sort_name = sort_name.id
+                 FROM " . $self->_table . "
+                 JOIN label ON rl.label = label.id
+                 JOIN label_name sort_name ON label.sort_name = sort_name.id
                  WHERE release IN (" . placeholders(@ids) . ")
                  ORDER BY release, rl_catalog_number, musicbrainz_collate(sort_name.name)";
     my @labels = query_to_list($self->c->sql, sub { $self->_new_from_row(@_) },

commit b20f9c0de55d38c9947f5f4b5e956f3d75091fbc
Author: Ian McEwen <[email protected]>
Date:   Tue Jan 8 13:01:59 2013 -0700

    MBS-5652: Switch to using the label's sortname

diff --git a/lib/MusicBrainz/Server/Data/ReleaseLabel.pm b/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
index 0c2d5fa..f11d8ee 100644
--- a/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
+++ b/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
@@ -47,9 +47,9 @@ sub load
     my @ids = keys %id_to_release;
     return unless @ids; # nothing to do
     my $query = "SELECT " . $self->_columns . "
-                 FROM " . $self->_table . "
+                 FROM " . $self->_table . " JOIN label ON rl.label = label.id JOIN label_name sort_name ON label.sort_name = sort_name.id
                  WHERE release IN (" . placeholders(@ids) . ")
-                 ORDER BY release, rl_catalog_number, rl_label";
+                 ORDER BY release, rl_catalog_number, musicbrainz_collate(sort_name.name)";
     my @labels = query_to_list($self->c->sql, sub { $self->_new_from_row(@_) },
                                $query, @ids);
     foreach my $label (@labels) {

commit aacc19dab4621b78593964cf6a11f4d9d952b179
Author: Ian McEwen <[email protected]>
Date:   Tue Jan 8 01:16:23 2013 -0700

    MBS-5652: sort labels when loaded by ReleaseLabel by the label ID after the catalog number

diff --git a/lib/MusicBrainz/Server/Data/ReleaseLabel.pm b/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
index 064deb4..0c2d5fa 100644
--- a/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
+++ b/lib/MusicBrainz/Server/Data/ReleaseLabel.pm
@@ -49,7 +49,7 @@ sub load
     my $query = "SELECT " . $self->_columns . "
                  FROM " . $self->_table . "
                  WHERE release IN (" . placeholders(@ids) . ")
-                 ORDER BY release, rl_catalog_number";
+                 ORDER BY release, rl_catalog_number, rl_label";
     my @labels = query_to_list($self->c->sql, sub { $self->_new_from_row(@_) },
                                $query, @ids);
     foreach my $label (@labels) {

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


hooks/post-receive
-- 
mb_server