diff --git a/terminusdb_client/__init__.py b/terminusdb_client/__init__.py index c4d79b5f..c1528bca 100644 --- a/terminusdb_client/__init__.py +++ b/terminusdb_client/__init__.py @@ -1,6 +1,6 @@ from .client import Patch, Client # noqa from .woqldataframe import woqlDataframe as WOQLDataFrame # noqa -from .woqlquery import WOQLQuery # noqa +from .woqlquery import WOQLQuery, Var, Vars # noqa from .woqlschema import * # noqa # Backwards compatibility WOQLClient = Client # noqa diff --git a/terminusdb_client/query_syntax/query_syntax.py b/terminusdb_client/query_syntax/query_syntax.py index cdb7a8d2..a1fc0e0e 100644 --- a/terminusdb_client/query_syntax/query_syntax.py +++ b/terminusdb_client/query_syntax/query_syntax.py @@ -1,11 +1,11 @@ -from ..woqlquery import WOQLQuery, Var, Doc # noqa +from ..woqlquery import WOQLQuery, Var, Vars, Doc # noqa import re import sys __BARRED = ['re', 'vars'] __ALLOWED = ['__and__', '__or__', '__add__'] __module = sys.modules[__name__] -__exported = ['Var', 'Doc'] +__exported = ['Var', 'Vars', 'Doc'] def __create_a_function(attribute): diff --git a/terminusdb_client/woqlquery/__init__.py b/terminusdb_client/woqlquery/__init__.py index 85395cdd..b9df830f 100644 --- a/terminusdb_client/woqlquery/__init__.py +++ b/terminusdb_client/woqlquery/__init__.py @@ -1 +1 @@ -from .woql_query import WOQLQuery, Var, Doc # noqa +from .woql_query import WOQLQuery, Var, Vars, Doc # noqa diff --git a/terminusdb_client/woqlquery/woql_query.py b/terminusdb_client/woqlquery/woql_query.py index 3056112d..2e700fc2 100644 --- a/terminusdb_client/woqlquery/woql_query.py +++ b/terminusdb_client/woqlquery/woql_query.py @@ -50,6 +50,12 @@ def __str__(self): return self.name +class Vars: + def __init__(self, *args): + for arg in args: + setattr(self, arg, Var(arg)) + + class Doc: def __init__(self, dictionary): self.dictionary = dictionary