Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id AF569200C4D for ; Wed, 5 Apr 2017 14:55:20 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id ADCD6160B94; Wed, 5 Apr 2017 12:55:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 00214160B91 for ; Wed, 5 Apr 2017 14:55:19 +0200 (CEST) Received: (qmail 51157 invoked by uid 500); 5 Apr 2017 12:55:19 -0000 Mailing-List: contact dev-help@ariatosca.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ariatosca.incubator.apache.org Delivered-To: mailing list dev@ariatosca.incubator.apache.org Received: (qmail 51145 invoked by uid 99); 5 Apr 2017 12:55:19 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2017 12:55:19 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id B35281803A4 for ; Wed, 5 Apr 2017 12:55:18 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.22 X-Spam-Level: X-Spam-Status: No, score=-4.22 tagged_above=-999 required=6.31 tests=[HK_RANDOM_FROM=0.001, KAM_ASCII_DIVIDERS=0.8, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id 7lOvn-nHvhEu for ; Wed, 5 Apr 2017 12:55:17 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with SMTP id 33FEF5F24C for ; Wed, 5 Apr 2017 12:55:17 +0000 (UTC) Received: (qmail 51139 invoked by uid 99); 5 Apr 2017 12:55:16 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2017 12:55:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 5A7BDDFBAB; Wed, 5 Apr 2017 12:55:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mxmrlv@apache.org To: dev@ariatosca.incubator.apache.org Message-Id: <126013cbcff34b90abe0895cf94cf5a4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ariatosca git commit: added raising for unsupported predicates Date: Wed, 5 Apr 2017 12:55:16 +0000 (UTC) archived-at: Wed, 05 Apr 2017 12:55:20 -0000 Repository: incubator-ariatosca Updated Branches: refs/heads/ARIA-137-Support-for-predicate-based-queries-in-the-SQL-mapi 81853bfb1 -> 01cda60df added raising for unsupported predicates Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/01cda60d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/01cda60d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/01cda60d Branch: refs/heads/ARIA-137-Support-for-predicate-based-queries-in-the-SQL-mapi Commit: 01cda60df62acd63acf41fb2a723b2ef25db492a Parents: 81853bf Author: max-orlov Authored: Wed Apr 5 15:55:11 2017 +0300 Committer: max-orlov Committed: Wed Apr 5 15:55:11 2017 +0300 ---------------------------------------------------------------------- aria/storage/sql_mapi.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/01cda60d/aria/storage/sql_mapi.py ---------------------------------------------------------------------- diff --git a/aria/storage/sql_mapi.py b/aria/storage/sql_mapi.py index 59312b8..dca6a5c 100644 --- a/aria/storage/sql_mapi.py +++ b/aria/storage/sql_mapi.py @@ -291,9 +291,13 @@ class SQLAlchemyModelAPI(api.ModelAPI): for column, conditions in filters.items(): if isinstance(conditions, dict): for predicate, operand in conditions.items(): - if predicate in _predicates: - del filters[column][predicate] - filters[column][_predicates[predicate]] = operand + if predicate not in _predicates: + raise exceptions.StorageError( + "ARIA doesn't support {0} as a valid predicate for filtering. Valid " + "predicates are {1}".format(predicate, ','.join(_predicates.keys()))) + del filters[column][predicate] + filters[column][_predicates[predicate]] = operand + return filters