cloudoll 2.2.19__tar.gz → 2.2.20__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (43) hide show
  1. {cloudoll-2.2.19 → cloudoll-2.2.20}/PKG-INFO +1 -1
  2. cloudoll-2.2.20/cloudoll/__init__.py +1 -0
  3. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/model.py +4 -1
  4. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/PKG-INFO +1 -1
  5. cloudoll-2.2.19/cloudoll/__init__.py +0 -1
  6. {cloudoll-2.2.19 → cloudoll-2.2.20}/LICENSE +0 -0
  7. {cloudoll-2.2.19 → cloudoll-2.2.20}/README.md +0 -0
  8. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/__main__.py +0 -0
  9. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/cli.py +0 -0
  10. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/error/__init__.py +0 -0
  11. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/error/errors.py +0 -0
  12. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/logging/__init__.py +0 -0
  13. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/mail/__init__.py +0 -0
  14. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/mail/smtp.py +0 -0
  15. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/__init__.py +0 -0
  16. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/base.py +0 -0
  17. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/err.py +0 -0
  18. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/field.py +0 -0
  19. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/mysql.py +0 -0
  20. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/parse.py +0 -0
  21. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/postgres.py +0 -0
  22. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/robot/__init__.py +0 -0
  23. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/robot/dingtalk.py +0 -0
  24. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/robot/feishu.py +0 -0
  25. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/robot/slack.py +0 -0
  26. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/utils/__init__.py +0 -0
  27. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/utils/common.py +0 -0
  28. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/utils/m2d.py +0 -0
  29. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/utils/patch_loop.py +0 -0
  30. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/utils/watch.py +0 -0
  31. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/__init__.py +0 -0
  32. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/exception.py +0 -0
  33. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/html.py +0 -0
  34. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/http.py +0 -0
  35. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/jwt.py +0 -0
  36. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/settings.py +0 -0
  37. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/SOURCES.txt +0 -0
  38. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/dependency_links.txt +0 -0
  39. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/entry_points.txt +0 -0
  40. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/requires.txt +0 -0
  41. {cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/top_level.txt +0 -0
  42. {cloudoll-2.2.19 → cloudoll-2.2.20}/setup.cfg +0 -0
  43. {cloudoll-2.2.19 → cloudoll-2.2.20}/setup.py +0 -0
{cloudoll-2.2.19 → cloudoll-2.2.20}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloudoll
3
- Version: 2.2.19
3
+ Version: 2.2.20
4
4
  Summary: 辅助快速创建可分布的微服务。
5
5
  Home-page: https://gitee.com/chuchur/cloudoll-py
6
6
  Author: chuchur
cloudoll-2.2.20/cloudoll/__init__.py ADDED
@@ -0,0 +1 @@
1
+ __version__ = "2.2.20"
{cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/model.py RENAMED
@@ -295,9 +295,12 @@ class Model(metaclass=ModelMetaclass):
295
295
  args = self.__params__
296
296
  rs = await self.__pool__.one(sql, args)
297
297
  if rs:
298
+ ## join 时返回dict
299
+ result = Object(rs) if self.__join__ is not None else self(**rs)
298
300
  self._reset()
301
+ return result
299
302
  # return self(**rs)
300
- return Object(rs)
303
+ # return Object(rs)
301
304
  # return cls(**rs)
302
305
  return None
303
306
 
{cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: cloudoll
3
- Version: 2.2.19
3
+ Version: 2.2.20
4
4
  Summary: 辅助快速创建可分布的微服务。
5
5
  Home-page: https://gitee.com/chuchur/cloudoll-py
6
6
  Author: chuchur
cloudoll-2.2.19/cloudoll/__init__.py DELETED
@@ -1 +0,0 @@
1
- __version__ = "2.2.19"
{cloudoll-2.2.19 → cloudoll-2.2.20}/LICENSE RENAMED
File without changes
{cloudoll-2.2.19 → cloudoll-2.2.20}/README.md RENAMED
File without changes
{cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/cli.py RENAMED
File without changes
{cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/orm/err.py RENAMED
File without changes
{cloudoll-2.2.19 → cloudoll-2.2.20}/cloudoll/web/jwt.py RENAMED
File without changes
{cloudoll-2.2.19 → cloudoll-2.2.20}/setup.cfg RENAMED
File without changes
{cloudoll-2.2.19 → cloudoll-2.2.20}/setup.py RENAMED
File without changes