vortex-cli 4.14.1__tar.gz → 4.15.1__tar.gz

{vortex_cli-4.14.1 → vortex_cli-4.15.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.14.1
+Version: 4.15.1
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
 Author-email: jordan.amos@gmail.com
@@ -76,6 +76,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.14.1 → vortex_cli-4.15.1}/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.14.1 → vortex_cli-4.15.1}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = vortex_cli
-version = 4.14.1
+version = 4.15.1
 long_description = file: README.md
 long_description_content_type = text/markdown
 url = https://github.com/jordanamos/vortex-cli

{vortex_cli-4.14.1 → vortex_cli-4.15.1}/vortex/cli.py

@@ -536,9 +536,13 @@ def add_db_parser(command_parser: _SubParsersAction[ArgumentParser]) -> Argument
     db_mutex = db_parser.add_mutually_exclusive_group(required=True)
     db_mutex.add_argument(
         "--sql",
+        type=str,
+        nargs="?",
+        const="",
         help=(
-            "Execute a given SQL query. "
-            "Requires <database> to be a database connection id (int)."
+            "The SQL query to execute. "
+            "Requires <database> to be a database connection id (int). "
+            "Interactively prompts for the sql if the value is empty (Non Windows)."
         ),
     )
     db_mutex.add_argument(

{vortex_cli-4.14.1 → vortex_cli-4.15.1}/vortex/commands/db.py

@@ -1,6 +1,10 @@
 from __future__ import annotations
 
 import logging
+import os
+import subprocess
+import sys
+import tempfile
 from typing import Any
 
 import tabulate
@@ -9,7 +13,6 @@ from vortex.models import DatabaseConnection
 from vortex.models import PuakmaServer
 from vortex.workspace import Workspace
 
-
 logger = logging.getLogger("vortex")
 
 GET_SCHEMA_SQL = """\
@@ -123,6 +126,17 @@ def _is_connection_cloned(workspace: Workspace, conn_id: int) -> bool:
     return any(conn.id == conn_id for conn in conns)
 
 
+def _read_from_editor() -> str:
+    fd, tmp_sql_file = tempfile.mkstemp(suffix=".sql")
+    os.close(fd)
+    try:
+        subprocess.call(["nano", tmp_sql_file])
+        with open(tmp_sql_file) as f:
+            return f.read().strip()
+    finally:
+        os.remove(tmp_sql_file)
+
+
 def db(
     workspace: Workspace,
     server: PuakmaServer,
@@ -134,7 +148,9 @@ def db(
     list_tables: bool = False,
     truncate_cols: bool = False,
 ) -> int:
-    if sql:
+    if sql is not None:
+        if sql.strip() == "":
+            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
@@ -142,7 +158,7 @@ def db(
         if update and not _is_connection_cloned(workspace, conn_id):
             logger.error(f"No cloned applications with DB Connection ID '{conn_id}'")
             return 1
-        if not update:
+        if sql and not update:
             sql = sql + f" LIMIT {limit_n_results}"
     else:
         db_name = str(database).lower()
@@ -154,8 +170,9 @@ def db(
         elif list_tables:
             sql = LIST_TABLES_SQL % db_name
 
-    if sql is None:
-        raise ValueError("No Query to execute.")
+    if not sql:
+        logger.error("No Query to execute.")
+        return 1
 
     return _output_result(
         server, conn_id, sql, update, truncate_cols, db_name, schema_table, list_tables

{vortex_cli-4.14.1 → vortex_cli-4.15.1}/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.14.1 → vortex_cli-4.15.1}/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.14.1 → vortex_cli-4.15.1}/vortex_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vortex_cli
-Version: 4.14.1
+Version: 4.15.1
 Home-page: https://github.com/jordanamos/vortex-cli
 Author: Jordan Amos
 Author-email: jordan.amos@gmail.com
@@ -76,6 +76,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