diff --git a/src/pt_snap_cli/cli.py b/src/pt_snap_cli/cli.py index 2ad1b3a..f141044 100644 --- a/src/pt_snap_cli/cli.py +++ b/src/pt_snap_cli/cli.py @@ -7,7 +7,7 @@ from pt_snap_cli import __version__ from pt_snap_cli.config import ENV_DB_PATH, Config, ContextResolutionError -from pt_snap_cli.context import Context +from pt_snap_cli.context import Context, DatabaseNotFoundError, SchemaVersionError app = typer.Typer( name="pt-snap", @@ -101,9 +101,12 @@ def use_database( typer.echo(f"Available devices: {', '.join(map(str, devices))}") else: typer.echo("No devices found in database.") - except Exception as e: + except (DatabaseNotFoundError, SchemaVersionError) as e: typer.secho(f"Error: {e}", fg=typer.colors.RED) raise typer.Exit(1) from None + except Exception as e: + typer.secho(f"Error: unexpected failure opening database: {e}", fg=typer.colors.RED) + raise typer.Exit(1) from None @app.command("query") diff --git a/src/pt_snap_cli/query/executor.py b/src/pt_snap_cli/query/executor.py index 406ca65..8fcecd4 100644 --- a/src/pt_snap_cli/query/executor.py +++ b/src/pt_snap_cli/query/executor.py @@ -120,7 +120,7 @@ def execute( else: cursor.execute(sql) columns = [desc[0] for desc in cursor.description] - return [dict(zip(columns, row, strict=False)) for row in cursor.fetchall()] + return [dict(zip(columns, row, strict=True)) for row in cursor.fetchall()] except Exception as e: raise QueryExecutionError(f"Query execution failed: {e}") from e