diff --git a/PyDAO_9000.egg-info/PKG-INFO b/PyDAO_9000.egg-info/PKG-INFO index 6a93282..1dbf3e7 100644 --- a/PyDAO_9000.egg-info/PKG-INFO +++ b/PyDAO_9000.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: PyDAO_9000 -Version: 1.2.6 +Version: 1.2.7 Summary: 'All-In-One File' SQL Code Generator Author-email: Randall Nagy Project-URL: Homepage, https://github.com/soft9000/PyDAO diff --git a/SqltDAO/CodeGen01/Meta.py b/SqltDAO/CodeGen01/Meta.py index 4eb7804..a8d95b6 100644 --- a/SqltDAO/CodeGen01/Meta.py +++ b/SqltDAO/CodeGen01/Meta.py @@ -12,7 +12,7 @@ class Meta: PRODUCT = "PyDAO 9000" - VERSION = '1.2.6' + VERSION = '1.2.7' @staticmethod def Title(): diff --git a/SqltDAO/CodeGen01/SqlSyntax.py b/SqltDAO/CodeGen01/SqlSyntax.py index cf3757a..fa82534 100644 --- a/SqltDAO/CodeGen01/SqlSyntax.py +++ b/SqltDAO/CodeGen01/SqlSyntax.py @@ -210,6 +210,7 @@ def code_class_template(self, text_file): self.level.push() result += self.level.print("''' New: Explicitly convert the SQLRow to our fields. '''") + result += self.level.print("''' Caveat: Full field selection is assumed, in natural order. '''") result += self.level.print("def select_dict(self, sql_select)->dict:") self.level.inc() result += self.level.print("if self.bOpen:") @@ -221,10 +222,11 @@ def code_class_template(self, text_file): result += self.level.print("try:") self.level.inc() result += self.level.print("result = OrderedDict(self.fields)") - result += self.level.print("for ss, tag in enumerate(result):") + result += self.level.print("for ss, tag in enumerate(result,1):") self.level.inc() result += self.level.print("result[tag] = ref[ss]") self.level.dec() + result += self.level.print("result['ID'] = ref[0]") result += self.level.print("yield result") self.level.dec() result += self.level.print("except:") diff --git a/dist/PyDAO_9000-1.2.6-py3-none-any.whl b/dist/PyDAO_9000-1.2.7-py3-none-any.whl similarity index 82% rename from dist/PyDAO_9000-1.2.6-py3-none-any.whl rename to dist/PyDAO_9000-1.2.7-py3-none-any.whl index 7e28419..36391ab 100644 Binary files a/dist/PyDAO_9000-1.2.6-py3-none-any.whl and b/dist/PyDAO_9000-1.2.7-py3-none-any.whl differ diff --git a/dist/pydao_9000-1.2.6.tar.gz b/dist/pydao_9000-1.2.6.tar.gz deleted file mode 100644 index 0ddbbbf..0000000 Binary files a/dist/pydao_9000-1.2.6.tar.gz and /dev/null differ diff --git a/dist/pydao_9000-1.2.7.tar.gz b/dist/pydao_9000-1.2.7.tar.gz new file mode 100644 index 0000000..9b8f74f Binary files /dev/null and b/dist/pydao_9000-1.2.7.tar.gz differ diff --git a/pyproject.toml b/pyproject.toml index e9d2ece..4e03a46 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "PyDAO_9000" -version = "1.2.6" +version = "1.2.7" authors = [ { name="Randall Nagy", email="r.a.nagy@gmail.com" }, ]