vortex-cli 4.15.0__tar.gz → 4.16.0__tar.gz

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.15.0
+Version: 4.16.0
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
 Author-email: jordan.amos@gmail.com
 License: MIT
 Keywords: vortex cli
-Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
@@ -76,6 +75,7 @@ While it is possible to use without it, this software has been purposefully desi
    puakma_db_conn_id = 13
    username = myuser ; Optional - Prompted at runtime if not provided
    password = mypassword ; Optional - Prompted at runtime if not provided
+   ; Optional
    lib_path = ; additional jars that should be included in the classpath
    java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
    java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/README.md

@@ -54,6 +54,7 @@ While it is possible to use without it, this software has been purposefully desi
    puakma_db_conn_id = 13
    username = myuser ; Optional - Prompted at runtime if not provided
    password = mypassword ; Optional - Prompted at runtime if not provided
+   ; Optional
    lib_path = ; additional jars that should be included in the classpath
    java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
    java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vortex_cli
-version = 4.15.0
+version = 4.16.0
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/jordanamos/vortex-cli
@@ -9,7 +9,6 @@ author_email = jordan.amos@gmail.com
 license = MIT
 license_files = LICENSE
 classifiers = 
-	Development Status :: 2 - Pre-Alpha
 	Intended Audience :: Developers
 	License :: OSI Approved :: MIT License
 	Natural Language :: English
@@ -38,7 +37,7 @@ console_scripts =
 
 [options.package_data]
 vortex = 
-	lib/puakma.jar
+	lib/puakma-6.0.37.jar
 	docs/Blackbook.pdf
 
 [flake8]

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/vortex/commands/db.py

@@ -93,8 +93,6 @@ def _output_result(
     list_tables: bool = False,
 ) -> int:
     with server:
-        logger.debug("Executing query")
-        logger.debug(sql)
         result = tuple(server.database_designer.execute_query(conn_id, sql, update))
         if schema_table and not result:
             logger.error(f"Table '{schema_table}' not found in database '{db_name}'")
@@ -134,13 +132,9 @@ def _read_from_editor() -> str:
     try:
         subprocess.call(["nano", tmp_sql_file])
         with open(tmp_sql_file) as f:
-            sql_query = f.read().strip()
-    except Exception:
+            return f.read().strip()
+    finally:
         os.remove(tmp_sql_file)
-        raise
-    else:
-        os.remove(tmp_sql_file)
-        return sql_query
 
 
 def db(
@@ -156,10 +150,7 @@ def db(
 ) -> int:
     if sql is not None:
         if sql.strip() == "":
-            if sys.platform == "win32":
-                sql = None
-            else:
-                sql = _read_from_editor()
+            sql = None if sys.platform == "win32" else _read_from_editor()
         db_name = None
         conn_id = int(database)
         # If we're modifying a database, lets check that its locally

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/vortex/soap.py

@@ -318,6 +318,7 @@ class ServerDesigner(_PuakmaSOAPService):
     def execute_command(self, command: str) -> str | None:
         operation = "executeCommand"
         params = [_SOAPParam("p1", command, _XSD_STRING)]
+        logger.debug(f"Executing command: {command}")
         resp = self._post(operation, params)
         return resp.text
 
@@ -338,6 +339,8 @@ class DatabaseDesigner(_PuakmaSOAPService):
             _SOAPParam("p2", query, _XSD_STRING),
             _SOAPParam("p3", is_update, _XSD_BOOLEAN),
         ]
+        logger.debug("Executing query")
+        logger.debug(query)
         resp = await self._apost(operation, params)
         col_lookup = [
             meta_row.attrib["name"] for meta_row in resp.findall(".//metadata")
@@ -367,6 +370,8 @@ class DatabaseDesigner(_PuakmaSOAPService):
             _SOAPParam("p2", query, _XSD_STRING),
             _SOAPParam("p3", is_update, _XSD_BOOLEAN),
         ]
+        logger.debug("Executing query")
+        logger.debug(query)
         resp = self._post(operation, params)
         col_lookup = [
             meta_row.attrib["name"] for meta_row in resp.findall(".//metadata")

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/vortex/workspace.py

@@ -159,10 +159,10 @@ class Workspace:
     ) -> list[Path]:
         """
         Returns a list of directories that contain a parseable
-        .PuakmaApplication.pickle file.
+        .pma file.
 
         If strict is False then return directories that simply
-        contain a .PuakmaApplication.pickle file.
+        contain a .pma file.
         """
         ret = []
         pattern = "**/.pma"

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/vortex_cli.egg-info/PKG-INFO

@@ -1,12 +1,11 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.15.0
+Version: 4.16.0
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
 Author-email: jordan.amos@gmail.com
 License: MIT
 Keywords: vortex cli
-Classifier: Development Status :: 2 - Pre-Alpha
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: English
@@ -76,6 +75,7 @@ While it is possible to use without it, this software has been purposefully desi
    puakma_db_conn_id = 13
    username = myuser ; Optional - Prompted at runtime if not provided
    password = mypassword ; Optional - Prompted at runtime if not provided
+   ; Optional
    lib_path = ; additional jars that should be included in the classpath
    java_home = /usr/lib/jvm/java-17-openjdk-amd64/ ; The local path to the JRE to use. Should be the same version running on your server
    java_environment_name = JavaSE-17 ; Java Execution Environment name https://docs.osgi.org/reference/eenames.html

{vortex_cli-4.15.0 → vortex_cli-4.16.0}/vortex_cli.egg-info/SOURCES.txt

@@ -31,7 +31,7 @@ vortex/commands/log.py
 vortex/commands/new.py
 vortex/commands/watch.py
 vortex/docs/Blackbook.pdf
-vortex/lib/puakma.jar
+vortex/lib/puakma-6.0.37.jar
 vortex_cli.egg-info/PKG-INFO
 vortex_cli.egg-info/SOURCES.txt
 vortex_cli.egg-info/dependency_links.txt