From 4a0932df1eaba7bb74564ca0986397b72afcf9dc Mon Sep 17 00:00:00 2001 From: carlad Date: Tue, 15 Sep 2015 11:45:16 +0200 Subject: [PATCH] prefix ids with correct tables when ordering --- lib/travis/api/v3/models/branch.rb | 4 ++-- lib/travis/api/v3/models/repository.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/travis/api/v3/models/branch.rb b/lib/travis/api/v3/models/branch.rb index faa7259e..fa0a00ef 100644 --- a/lib/travis/api/v3/models/branch.rb +++ b/lib/travis/api/v3/models/branch.rb @@ -2,7 +2,7 @@ module Travis::API::V3 class Models::Branch < Model belongs_to :repository belongs_to :last_build, class_name: 'Travis::API::V3::Models::Build'.freeze - has_many :builds, foreign_key: [:repository_id, :branch], primary_key: [:repository_id, :name], order: 'id DESC'.freeze, conditions: { event_type: 'push' } - has_many :commits, foreign_key: [:repository_id, :branch], primary_key: [:repository_id, :name], order: 'id DESC'.freeze + has_many :builds, foreign_key: [:repository_id, :branch], primary_key: [:repository_id, :name], order: 'builds.id DESC'.freeze, conditions: { event_type: 'push' } + has_many :commits, foreign_key: [:repository_id, :branch], primary_key: [:repository_id, :name], order: 'commits.id DESC'.freeze end end diff --git a/lib/travis/api/v3/models/repository.rb b/lib/travis/api/v3/models/repository.rb index 5e7cd0ec..6bf8f4de 100644 --- a/lib/travis/api/v3/models/repository.rb +++ b/lib/travis/api/v3/models/repository.rb @@ -2,8 +2,8 @@ module Travis::API::V3 class Models::Repository < Model has_many :commits, dependent: :delete_all has_many :requests, dependent: :delete_all - has_many :branches, dependent: :delete_all, order: 'id DESC'.freeze - has_many :builds, dependent: :delete_all, order: 'id DESC'.freeze + has_many :branches, dependent: :delete_all, order: 'branches.id DESC'.freeze + has_many :builds, dependent: :delete_all, order: 'builds.id DESC'.freeze has_many :permissions, dependent: :delete_all has_many :users, through: :permissions