From 7b51f42ce04336b87d2af1ad8e2ca0cd0d68f704 Mon Sep 17 00:00:00 2001
From: Bruno Guillon <bruno.guillon@uca.fr>
Date: Fri, 25 Mar 2022 15:00:16 +0100
Subject: [PATCH] types subdialect bugs fixed
---
BUGS.md | 4 ----
querybuilder/dialect.py | 2 +-
querybuilder/tools.py | 4 +++-
3 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/BUGS.md b/BUGS.md
index 93cc83f0..280ef042 100644
--- a/BUGS.md
+++ b/BUGS.md
@@ -1,7 +1,3 @@
Known bugs
==========
-+ in `qb.sql.types`
- + autocompletion is not working
- + `_repr_pretty` is not working
- + `dir` is not working
diff --git a/querybuilder/dialect.py b/querybuilder/dialect.py
index 05bc184f..29d21924 100644
--- a/querybuilder/dialect.py
+++ b/querybuilder/dialect.py
@@ -255,7 +255,7 @@ class Dialect(qbtools.AttrDict):
def __repr__(self):
return f"{type(self).__name__}.dialects[{self.fullname}]"
def _pretty_repr_(self):
- return f"{type(self).__name__}({self.fullname})〈{', '.join(self)}〉"
+ return f"{type(self).__name__}({self.fullname})〈{', '.join(map(str, self))}〉"
def _repr_pretty_(self, printer, cycle):
printer.text(self._pretty_repr_())
def __iter__(self):
diff --git a/querybuilder/tools.py b/querybuilder/tools.py
index 40ee15f3..bf806022 100644
--- a/querybuilder/tools.py
+++ b/querybuilder/tools.py
@@ -55,7 +55,9 @@ class AttrDict(collections.abc.MutableMapping):
else:
super().__setattr__(attr, v)
def __dir__(self):
- return self.proxy_dict.keys()
+ return frozenset(self._reserved_names).union(
+ k for k in self.proxy_dict.keys() if isinstance(k, str) and k.isidentifier()
+ )
#MutableMapping method
def __getitem__(self, k):
--
GitLab