.bumpversion.cfg

 [bumpversion]
-current_version = 0.7.2
+current_version = 0.7.3
 commit = True
 tag = True
 

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.7.3]
+
+### Fixed
+
+- Fixed default logic with fetched_meta
+
 ## [0.7.2]
 
 ### Added

anji_orm/__init__.py

@@ -4,7 +4,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/__init__.py

@@ -13,7 +13,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/__init__.py

@@ -9,7 +9,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/base.py

@@ -8,7 +8,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/filters.py

@@ -19,7 +19,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/operations.py

@@ -15,7 +15,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/rows.py

@@ -16,7 +16,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/transformation.py

@@ -11,7 +11,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/ast/utils.py

@@ -2,7 +2,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/executor.py

@@ -12,7 +12,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"
@@ -79,10 +79,11 @@ def fetch(data_dict: Dict[str, Any], meta: Optional[Dict] = None) -> Any:
     from .register import orm_register
 
     fetched_dict, fetched_meta = orm_register.backend_adapter.fetch_processor(data_dict)
-    if meta is not None:
-        meta.update(fetched_meta)  # type: ignore
-    else:
-        meta = fetched_meta
+    if fetched_meta is not None:
+        if meta is not None:
+            meta.update(fetched_meta)  # type: ignore
+        else:
+            meta = fetched_meta
     if fetched_dict is None:
         return None
     if '_python_info' not in fetched_dict:

anji_orm/core/fields/__init__.py

@@ -5,7 +5,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/fields/base.py

@@ -15,7 +15,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/fields/extras.py

@@ -9,7 +9,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/indexes.py

@@ -11,7 +11,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/loggers.py

@@ -4,7 +4,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/model.py

@@ -14,7 +14,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/parser/__init__.py

@@ -7,7 +7,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"

anji_orm/core/parser/base.py

@@ -13,7 +13,7 @@ __author__ = "Bogdan Gladyshev"
 __copyright__ = "Copyright 2017, Bogdan Gladyshev"
 __credits__ = ["Bogdan Gladyshev"]
 __license__ = "MIT"
-__version__ = "0.7.2"
+__version__ = "0.7.3"
 __maintainer__ = "Bogdan Gladyshev"
 __email__ = "siredvin.dark@gmail.com"
 __status__ = "Production"