From patchwork Fri May 27 04:21:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lucas Meneghel Rodrigues X-Patchwork-Id: 822842 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4R4LsIR028354 for ; Fri, 27 May 2011 04:21:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752065Ab1E0EVu (ORCPT ); Fri, 27 May 2011 00:21:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29041 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750777Ab1E0EVt (ORCPT ); Fri, 27 May 2011 00:21:49 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p4R4Lmep020244 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 27 May 2011 00:21:48 -0400 Received: from justice.redhat.com (vpn-10-216.rdu.redhat.com [10.11.10.216]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p4R4LaMP004814; Fri, 27 May 2011 00:21:47 -0400 From: Lucas Meneghel Rodrigues To: autotest@test.kernel.org Cc: kvm@vger.kernel.org, Lucas Meneghel Rodrigues Subject: [PATCH 5/6] Removing get_from_clause() from custom query class Date: Fri, 27 May 2011 01:21:33 -0300 Message-Id: <1306470094-16960-6-git-send-email-lmr@redhat.com> In-Reply-To: <1306470094-16960-1-git-send-email-lmr@redhat.com> References: <1306470094-16960-1-git-send-email-lmr@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 27 May 2011 04:21:55 +0000 (UTC) Signed-off-by: Lucas Meneghel Rodrigues --- frontend/afe/model_logic.py | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/frontend/afe/model_logic.py b/frontend/afe/model_logic.py index 0ddcefe..38bcabe 100644 --- a/frontend/afe/model_logic.py +++ b/frontend/afe/model_logic.py @@ -124,21 +124,6 @@ class ExtendedManager(dbmodels.Manager): self._custom_joins.append(join_dict) - def get_from_clause(self): - from_, params = (super(ExtendedManager.CustomQuery, self) - .get_from_clause()) - - for join_dict in self._custom_joins: - from_.append('%s %s AS %s ON (%s)' - % (join_dict['join_type'], - _quote_name(join_dict['table']), - _quote_name(join_dict['alias']), - join_dict['condition'])) - params.extend(join_dict['condition_values']) - - return from_, params - - @classmethod def convert_query(self, query_set): """