rosetta-sql 1.0.2__tar.gz → 1.1.0__tar.gz

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: rosetta-sql
-Version: 1.0.2
+Version: 1.1.0
 Summary: Cross-DBMS SQL behavioral consistency verification tool
 Author: yangshijie
 License: MIT
@@ -27,6 +27,7 @@ Requires-Dist: rich>=13.0
 Requires-Dist: prompt_toolkit>=3.0.52
 Provides-Extra: mysql-connector
 Requires-Dist: mysql-connector-python>=8.0; extra == "mysql-connector"
+Dynamic: license-file
 
 # Rosetta
 Cross-DBMS SQL testing & benchmarking toolkit.
@@ -86,7 +87,7 @@ curl -fsSL https://raw.githubusercontent.com/sjyango/rosetta/main/uninstall.sh |
 rosetta config init
 
 # 2. Edit DB connection info
-vim dbms_config.json
+vim rosetta_config.json
 
 # 3. Check DB connectivity
 rosetta status
@@ -118,7 +119,7 @@ All commands support these flags (can appear before or after the subcommand):
 | Argument | Default | Description |
 |----------|---------|-------------|
 | `-j / --json` | `False` | JSON output (AI Agent friendly) |
-| `-c / --config` | `dbms_config.json` | DBMS config file path |
+| `-c / --config` | `rosetta_config.json` | DBMS config file path |
 | `-v / --verbose` | `False` | Enable verbose/debug logging |
 
 ### Commands
@@ -272,7 +273,7 @@ rosetta config validate
 
 | Action | Description |
 |--------|-------------|
-| `init` | Generate a sample `dbms_config.sample.json` |
+| `init` | Generate a sample `rosetta_config.sample.json` |
 | `show` | Display current config details |
 | `validate` | Validate JSON structure and test connectivity |
 
@@ -340,7 +341,7 @@ rosetta i --serve
 ---
 
 ## Configuration
-Sample `dbms_config.json`:
+Sample `rosetta_config.json`:
 ```json
 {
   "databases": [

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/README.md

@@ -56,7 +56,7 @@ curl -fsSL https://raw.githubusercontent.com/sjyango/rosetta/main/uninstall.sh |
 rosetta config init
 
 # 2. Edit DB connection info
-vim dbms_config.json
+vim rosetta_config.json
 
 # 3. Check DB connectivity
 rosetta status
@@ -88,7 +88,7 @@ All commands support these flags (can appear before or after the subcommand):
 | Argument | Default | Description |
 |----------|---------|-------------|
 | `-j / --json` | `False` | JSON output (AI Agent friendly) |
-| `-c / --config` | `dbms_config.json` | DBMS config file path |
+| `-c / --config` | `rosetta_config.json` | DBMS config file path |
 | `-v / --verbose` | `False` | Enable verbose/debug logging |
 
 ### Commands
@@ -242,7 +242,7 @@ rosetta config validate
 
 | Action | Description |
 |--------|-------------|
-| `init` | Generate a sample `dbms_config.sample.json` |
+| `init` | Generate a sample `rosetta_config.sample.json` |
 | `show` | Display current config details |
 | `validate` | Validate JSON structure and test connectivity |
 
@@ -310,7 +310,7 @@ rosetta i --serve
 ---
 
 ## Configuration
-Sample `dbms_config.json`:
+Sample `rosetta_config.json`:
 ```json
 {
   "databases": [

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rosetta-sql"
-version = "1.0.2"
+version = "1.1.0"
 description = "Cross-DBMS SQL behavioral consistency verification tool"
 readme = "README.md"
 license = {text = "MIT"}

rosetta_sql-1.1.0/rosetta/__init__.py

@@ -0,0 +1,11 @@
+"""Rosetta — Cross-DBMS SQL behavioral consistency verification tool."""
+
+from importlib.metadata import version as _get_version
+
+try:
+    __version__ = _get_version("rosetta-sql")
+except Exception:
+    # Fallback for editable install / development mode
+    import tomllib
+    with open(__file__ + "/../pyproject.toml", "rb") as _f:
+        __version__ = tomllib.load(_f)["project"]["version"]

rosetta_sql-1.1.0/rosetta/__main__.py

@@ -0,0 +1,6 @@
+"""Allow running as: python -m rosetta"""
+
+from .cli.main import main
+
+if __name__ == "__main__":
+    main()

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/rosetta/cli/config_cmd.py

@@ -50,7 +50,9 @@ def _handle_config_show(args, output: "OutputFormatter") -> CommandResult:
     
     if not os.path.isfile(args.config):
         return CommandResult.failure(
-            f"Config file not found: {args.config}",
+            f"Config file not found: {args.config}\n"
+            f"Run 'rosetta config init' to create a sample config, "
+            f"or use '-c' to specify the config file path.",
         )
     
     try:
@@ -103,7 +105,9 @@ def _handle_config_validate(args, output: "OutputFormatter") -> CommandResult:
     
     if not os.path.isfile(args.config):
         return CommandResult.failure(
-            f"Config file not found: {args.config}",
+            f"Config file not found: {args.config}\n"
+            f"Run 'rosetta config init' to create a sample config, "
+            f"or use '-c' to specify the config file path.",
         )
     
     errors = []
@@ -204,7 +208,10 @@ def _handle_config_validate(args, output: "OutputFormatter") -> CommandResult:
 
 def _handle_config_init(args, output: "OutputFormatter") -> CommandResult:
     """
-    Generate sample configuration file.
+    Initialize ~/.rosetta directory and generate sample config.
+    
+    Creates the ~/.rosetta/ directory structure and generates a sample
+    config.json if it doesn't already exist.
     
     Args:
         args: Parsed arguments
@@ -214,30 +221,44 @@ def _handle_config_init(args, output: "OutputFormatter") -> CommandResult:
         CommandResult with generated config path
     """
     from ..config import generate_sample_config
+    from ..paths import CONFIG_FILE, ensure_home
     
     # Determine output path
-    output_path = args.output if args.output else "dbms_config.sample.json"
+    output_path = args.output if args.output else CONFIG_FILE
+    
+    # Ensure ~/.rosetta directory exists
+    home = ensure_home()
     
     # Check if file already exists
     if os.path.isfile(output_path):
+        # Preserve the original command name: "init" when called via
+        # ``rosetta init``, "config init" when called via ``rosetta config init``
+        command = getattr(args, 'command', None)
+        cmd_name = "init" if command == "init" else "config init"
         return CommandResult.failure(
-            f"File already exists: {output_path}. Use --output to specify a different path",
-            command="config init",
+            f"Config already exists: {output_path}. "
+            f"Edit it directly or use --output to specify a different path.",
+            command=cmd_name,
         )
     
     # Generate sample config
     try:
         generate_sample_config(output_path)
     except Exception as e:
+        command = getattr(args, 'command', None)
+        cmd_name = "init" if command == "init" else "config init"
         return CommandResult.failure(
             f"Failed to generate config: {str(e)}",
-            command="config init",
+            command=cmd_name,
         )
     
     return CommandResult.success(
         "config init",
         {
+            "rosetta_home": home,
             "config_path": os.path.abspath(output_path),
-            "message": f"Sample config written to {output_path}",
+            "message": f"Initialized {home}\n"
+                       f"Config written to {output_path}\n"
+                       f"Edit the database connections, then run: rosetta status",
         },
     )

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/rosetta/cli/exec.py

@@ -26,12 +26,15 @@ def handle_exec(args, output: "OutputFormatter") -> CommandResult:
     import time as _time
     from ..config import load_config, filter_configs
     from ..executor import DBConnection, check_port
-    from ..parser import TestFileParser
+    from ..mtr.parser import MtrParser
+    from ..mtr.nodes import MtrCommandType
     
     # Load config
     if not os.path.isfile(args.config):
         return CommandResult.failure(
-            f"Config file not found: {args.config}",
+            f"Config file not found: {args.config}\n"
+            f"Run 'rosetta config init' to create a sample config, "
+            f"or use '-c' to specify the config file path.",
         )
     
     all_configs = load_config(args.config)
@@ -65,13 +68,27 @@ def handle_exec(args, output: "OutputFormatter") -> CommandResult:
             sql_text = f.read()
     else:
         return CommandResult.failure(
-            "Either --sql or --file is required",
+            "Either --sql or --file is required. "
+            "Use --sql 'SELECT ...' or --file /path/to/script.sql",
         )
     
     # Parse SQL statements
+    # For --sql mode, split on semicolons first so that
+    # "SELECT 1; SELECT 2" is treated as two statements.
+    # The MTR parser is line-based and won't split in-line semicolons.
     try:
-        parsed = TestFileParser.parse_text(sql_text)
-        statements = [s.text for s in parsed]
+        if args.sql and ";" in sql_text:
+            # Split by semicolons, filter empty, and re-join with newlines
+            # so the MTR parser treats each as a separate statement.
+            parts = [p.strip() for p in sql_text.split(";") if p.strip()]
+            sql_text_for_parse = ";\n".join(parts) + ";\n"
+            mtr_parser = MtrParser()
+            parsed = mtr_parser.parse_text(sql_text_for_parse)
+        else:
+            mtr_parser = MtrParser()
+            parsed = mtr_parser.parse_text(sql_text)
+        statements = [cmd.argument for cmd in parsed.commands
+                      if cmd.cmd_type == MtrCommandType.SQL]
     except Exception as e:
         return CommandResult.failure(f"Parse error: {str(e)}")
     

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/rosetta/cli/interactive_cmd.py

@@ -31,7 +31,9 @@ def handle_interactive(args, output: "OutputFormatter") -> CommandResult:
     # Load config
     if not os.path.isfile(args.config):
         return CommandResult.failure(
-            f"Config file not found: {args.config}",
+            f"Config file not found: {args.config}\n"
+            f"Run 'rosetta config init' to create a sample config, "
+            f"or use '-c' to specify the config file path.",
         )
     
     all_configs = load_config(args.config)
@@ -55,7 +57,7 @@ def handle_interactive(args, output: "OutputFormatter") -> CommandResult:
         
         if not reachable_configs:
             return CommandResult.failure(
-                "No reachable DBMS found. Check your dbms_config.json"
+                "No reachable DBMS found. Check your ~/.rosetta/config.json"
             )
         
         configs = reachable_configs
@@ -75,7 +77,7 @@ def handle_interactive(args, output: "OutputFormatter") -> CommandResult:
                 "dbms_targets": [c.name for c in configs],
                 "database": args.database,
                 "output_dir": os.path.abspath(args.output_dir),
-                "serve": args.serve,
+                "serve": True,
                 "port": args.port,
             },
         )
@@ -95,29 +97,19 @@ def handle_interactive(args, output: "OutputFormatter") -> CommandResult:
         
         # Use filtered configs (either user-specified or auto-detected reachable)
         legacy_args.dbms = ",".join(c.name for c in configs)
-        if args.serve:
-            legacy_args.serve = args.serve
         if args.port:
             legacy_args.port = args.port
         
+        # serve is always on for interactive mode
+        legacy_args.serve = True
+        
         # Launch interactive session
         exit_code = _enter_interactive(legacy_args)
         
-        return CommandResult.success(
-            "interactive",
-            {
-                "exit_code": exit_code,
-                "message": "Interactive session ended",
-            },
-        )
+        return CommandResult.success("interactive")
     
     except KeyboardInterrupt:
-        return CommandResult.success(
-            "interactive",
-            {
-                "message": "Interactive session interrupted",
-            },
-        )
+        return CommandResult.success("interactive")
     except Exception as e:
         return CommandResult.failure(
             f"Interactive session failed: {str(e)}",

{rosetta_sql-1.0.2 → rosetta_sql-1.1.0}/rosetta/cli/list_cmd.py

@@ -26,8 +26,6 @@ def handle_list(args, output: "OutputFormatter") -> CommandResult:
         return _handle_list_dbms(args, output)
     elif args.resource == "history":
         return _handle_list_history(args, output)
-    elif args.resource == "templates":
-        return _handle_list_templates(args, output)
     else:
         return CommandResult.failure(
             f"Unknown list resource: {args.resource}",
@@ -51,7 +49,9 @@ def _handle_list_dbms(args, output: "OutputFormatter") -> CommandResult:
     # Load config
     if not os.path.isfile(args.config):
         return CommandResult.failure(
-            f"Config file not found: {args.config}",
+            f"Config file not found: {args.config}\n"
+            f"Run 'rosetta config init' to create a sample config, "
+            f"or use '-c' to specify the config file path.",
         )
     
     all_configs = load_config(args.config)
@@ -107,7 +107,8 @@ def _handle_list_history(args, output: "OutputFormatter") -> CommandResult:
     import json
     from pathlib import Path
     
-    output_dir = args.output_dir if hasattr(args, "output_dir") else "results"
+    from ..paths import RESULTS_DIR as _DEFAULT_RESULTS
+    output_dir = args.output_dir if hasattr(args, "output_dir") else _DEFAULT_RESULTS
     
     if not os.path.isdir(output_dir):
         return CommandResult.failure(
@@ -173,43 +174,4 @@ def _handle_list_history(args, output: "OutputFormatter") -> CommandResult:
     )
 
 
-def _handle_list_templates(args, output: "OutputFormatter") -> CommandResult:
-    """
-    List built-in benchmark templates.
-    
-    Args:
-        args: Parsed arguments
-        output: Output formatter
-    
-    Returns:
-        CommandResult with template list
-    """
-    from ..benchmark import BenchmarkLoader
-    
-    templates = BenchmarkLoader.list_builtin_templates()
-    
-    template_info = []
-    for name in templates:
-        info = {
-            "name": name,
-            "description": _get_template_description(name),
-        }
-        template_info.append(info)
-    
-    return CommandResult.success(
-        "list templates",
-        {
-            "total": len(templates),
-            "templates": template_info,
-        },
-    )
-
 
-def _get_template_description(name: str) -> str:
-    """Get description for a built-in template."""
-    descriptions = {
-        "oltp_read_write": "OLTP Read-Write mixed workload with point selects, updates, inserts, and aggregates",
-        "oltp_read_only": "OLTP Read-Only workload with point selects, range scans, and aggregates",
-        "oltp_write_only": "OLTP Write-Only workload with inserts, updates, replaces, and deletes",
-    }
-    return descriptions.get(name, "Built-in benchmark template")