Return-Path: X-Original-To: apmail-incubator-bloodhound-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-bloodhound-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5441FD574 for ; Tue, 19 Feb 2013 14:53:44 +0000 (UTC) Received: (qmail 54540 invoked by uid 500); 19 Feb 2013 14:53:44 -0000 Delivered-To: apmail-incubator-bloodhound-commits-archive@incubator.apache.org Received: (qmail 54516 invoked by uid 500); 19 Feb 2013 14:53:44 -0000 Mailing-List: contact bloodhound-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: bloodhound-dev@incubator.apache.org Delivered-To: mailing list bloodhound-commits@incubator.apache.org Received: (qmail 54504 invoked by uid 99); 19 Feb 2013 14:53:44 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 14:53:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2013 14:53:41 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CCAE72388900; Tue, 19 Feb 2013 14:53:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1447742 - /incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/dbcursor.py Date: Tue, 19 Feb 2013 14:53:22 -0000 To: bloodhound-commits@incubator.apache.org From: jure@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130219145322.CCAE72388900@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jure Date: Tue Feb 19 14:53:22 2013 New Revision: 1447742 URL: http://svn.apache.org/r1447742 Log: Don't prefix custom (3rd party plugin) tables when running in global environment. Also fixes failing test cases after sync merge from trunk (r1447714) Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/dbcursor.py Modified: incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/dbcursor.py URL: http://svn.apache.org/viewvc/incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/dbcursor.py?rev=1447742&r1=1447741&r2=1447742&view=diff ============================================================================== --- incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/dbcursor.py (original) +++ incubator/bloodhound/branches/bep_0003_multiproduct/bloodhound_multiproduct/multiproduct/dbcursor.py Tue Feb 19 14:53:22 2013 @@ -248,7 +248,7 @@ class BloodhoundProductSQLTranslate(obje return sql def _prefixed_table_entity_name(self, tablename): - return "%s_%s" % (self._product_prefix, tablename) + return "%s_%s" % (self._product_prefix, tablename) if self._product_prefix else tablename def _prefixed_table_view_sql(self, name, alias): return '(SELECT * FROM %s) AS %s' % (self._prefixed_table_entity_name(name),