fix(cli): Readiness check fixes and grouping the per DB checks

.github/workflows/release.yaml

@@ -125,7 +125,7 @@ jobs:
       CARGO: cargo
       CARGO_BUILD_TARGET: ${{ matrix.job.target }}
       PYAPP_REPO: pyapp
-      PYAPP_VERSION: v0.23.0
+      PYAPP_VERSION: v0.24.0
       PYAPP_PYTHON_VERSION: "3.12"
       PYAPP_PROJECT_FEATURES: oracle,postgres,mssql,mysql,server
       PYAPP_DISTRIBUTION_EMBED: "1"

.pre-commit-config.yaml

@@ -15,7 +15,7 @@ exclude: "^docs/conf.py"
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: check-added-large-files
@@ -32,7 +32,7 @@ repos:
 
   # Ruff replaces black, flake8, autoflake and isort
   - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: "v0.5.6" # make sure this is always consistent with hatch configs
+    rev: "v0.7.1" # make sure this is always consistent with hatch configs
     hooks:
       - id: ruff
         args: [--config, ./pyproject.toml]

pyproject.toml

@@ -88,7 +88,7 @@ dma = "dma.cli.main:app"
 
 [build-system]
 build-backend = "hatchling.build"
-requires = ["hatchling", "nodeenv"]
+requires = ["hatchling"]
 
 [tool.hatch.metadata]
 # direct dependency references, e.g `pip @ git+https://github.com/pypa/pip.git@master`

scripts/collector/sqlserver/dmaSQLServerPerfmonDataset.ps1

@@ -722,4 +722,4 @@ elseif ($operation.ToLower() -eq "status") {
 }
 else {
 	Write-Output "Operation $operation specified is invalid"
-}
+}

scripts/intall-hatch.sh

@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# --- Constants ---
+BASE_URL="https://github.com/pypa/hatch/releases/latest/download"
+EXTRACT_CMD="tar -xzf"
+
+# --- Handle Optional Installation Directory ---
+INSTALL_DIR="$1"  # Default: current directory
+if [[ -n "$INSTALL_DIR" ]]; then
+    if [[ ! -d "$INSTALL_DIR" ]]; then  # Check if directory exists
+        INSTALL_DIR="$HOME/.local/bin"
+        echo "Error: Invalid install directory '$INSTALL_DIR'"
+        exit 1
+    fi
+    INSTALL_DIR=$(realpath "$INSTALL_DIR")  # Get absolute path
+fi
+
+# --- Determine Platform ---
+PLATFORM=$(uname -s)
+MACHINE=$(uname -m)
+FILE_EXT="tar.gz"
+
+if [[ $PLATFORM == "Darwin" ]]; then
+    PLATFORM_NAME="apple-darwin"
+elif [[ $PLATFORM == "Linux" ]]; then
+    PLATFORM_NAME="unknown-linux-gnu"
+    if [[ $MACHINE == "aarch64" ]]; then
+        MACHINE="aarch64"
+    fi
+elif [[ $PLATFORM == "Windows" ]]; then
+    PLATFORM_NAME="pc-windows-msvc"
+    FILE_EXT="zip"
+    EXTRACT_CMD="unzip"
+else
+    echo "Unsupported platform: $PLATFORM"
+    exit 1
+fi
+
+# --- Construct File Name and URL ---
+FILENAME="hatch-$MACHINE-$PLATFORM_NAME.$FILE_EXT"
+URL="$BASE_URL/$FILENAME"
+
+# --- Download and Extract ---
+echo "Downloading Hatch binary: $FILENAME"
+curl -L -o "$FILENAME" "$URL"
+
+echo "Extracting to '$INSTALL_DIR'..."
+$EXTRACT_CMD "$FILENAME" -C "$INSTALL_DIR"  # Extract to install directory
+rm "$FILENAME"  # Remove archive
+
+HATCH_BINARY="$INSTALL_DIR/hatch"  # Path to the extracted binary
+if [[ -x "$HATCH_BINARY" ]]; then
+    echo "Hatch binary successfully installed at '$HATCH_BINARY'"
+else
+    echo "Error: Hatch binary not found or not executable."
+fi

src/dma/collector/sql/sources/postgres/collection-replication_stats.sql

@@ -19,7 +19,7 @@ with src as (
     r.usesysid,
     r.usename,
     r.application_name,
-    r.client_addr,
+    host(r.client_addr) as client_addr,
     r.client_hostname,
     r.client_port,
     r.backend_start,

src/dma/collector/sql/sources/postgres/init.sql

@@ -14,7 +14,7 @@
  limitations under the License.
  */
 -- name: init-get-db-version$
-select current_setting('server_version_num')::VARCHAR as db_version;
+select current_setting('server_version')::VARCHAR as db_version;
 
 -- name: init-get-execution-id$
 select 'postgres_' || current_setting('server_version_num') || '_' || to_char(current_timestamp, 'YYYYMMDDHH24MISSMS') as execution_id;