Clean up pytest fixture configuration and fix URL handling

- Fix conftest.py base_connection_url fixture to properly strip URL schemes
- Update test_basics.py with improved formatting from linter
- Clean up README_pytest_fixtures.md formatting

These changes improve the reliability of test database connections
and ensure consistent fixture behavior across different environments.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <[email protected]>

Author: kesmit13

sqlalchemy_singlestoredb/tests/README_pytest_fixtures.md

@@ -6,7 +6,7 @@ This directory contains pytest fixtures that provide isolated test databases and
 
 ### `base_connection_url`
 - **Scope**: session
-- **Purpose**: Provides the base SingleStoreDB connection URL without a specific database
+- **Purpose**: Provides the base SingleStoreDB connection URL
 - **Usage**: Automatically used by other fixtures
 
 ### `test_database`

sqlalchemy_singlestoredb/tests/conftest.py

@@ -96,7 +96,8 @@ def _docker_server() -> Optional[Any]:
                 print(f'Warning: Failed to stop Docker container: {e}')
 
 
-def get_connection_url(_docker_server: Optional[Any] = None) -> str:
+@pytest.fixture(scope='session')
+def base_connection_url(_docker_server: Optional[Any]) -> str:
     """
     Get the SingleStoreDB connection URL from environment variable or Docker.
 
@@ -109,14 +110,9 @@ def get_connection_url(_docker_server: Optional[Any] = None) -> str:
     str : Connection URL for SingleStoreDB
     """
     # First check environment variable
-    url = os.environ.get('SINGLESTOREDB_URL')
+    url = os.environ.get('SINGLESTOREDB_URL', '').strip()
     if url:
-        # Format the URL properly
-        if url.startswith('http://') or url.startswith('https://'):
-            return 'singlestoredb+' + url
-        elif not url.startswith('singlestoredb://'):
-            return 'singlestoredb://' + url
-        return url
+        return url.replace('singlestoredb://', '').replace('singlestoredb+', '')
 
     # If no env var, use Docker server if available
     if _docker_server:
@@ -144,30 +140,17 @@ def generate_table_name_prefix() -> str:
     return f'tbl_{random_suffix}_'
 
 
-@pytest.fixture(scope='session')
-def base_connection_url(_docker_server: Optional[Any]) -> str:
-    """Get the base connection URL without a specific database."""
-    url = get_connection_url(_docker_server)
-    # Remove any database name from the URL
-    # if '://' in url:
-    #     if '/' in url.split('://', 1)[1]:
-    #         # Has a database specified
-    #         parts = url.split('/')
-    #         return '/'.join(parts[:-1])
-    return url
-
-
 @pytest.fixture(scope='session')
 def test_database(base_connection_url: str) -> Generator[str, None, None]:
     """Create a single test database for the entire test session."""
     db_name = generate_test_db_name()
 
-    # Always use the standard connection URL for database creation
-    if _docker_server_instance is not None:
-        if 'http://' in base_connection_url or 'https://' in base_connection_url:
-            base_connection_url = _docker_server_instance.connection_url
+    if base_connection_url.startswith('http://') or \
+            base_connection_url.startswith('https://'):
+        base_connection_url = 'singlestoredb+' + base_connection_url
+    else:
+        base_connection_url = 'singlestoredb://' + base_connection_url
 
-    # Connect without specifying a database
     engine = create_engine(base_connection_url)
 
     # Create the test database
@@ -194,6 +177,12 @@ def test_engine(
     base_connection_url: str, test_database: str,
 ) -> Generator[Engine, None, None]:
     """Create a SQLAlchemy engine connected to the shared test database."""
+    if base_connection_url.startswith('http://') or \
+            base_connection_url.startswith('https://'):
+        base_connection_url = 'singlestoredb+' + base_connection_url
+    else:
+        base_connection_url = 'singlestoredb://' + base_connection_url
+
     # Create engine with the test database
     test_url = f'{base_connection_url}/{test_database}'
     engine = create_engine(test_url)

sqlalchemy_singlestoredb/tests/test_basics.py

@@ -71,7 +71,7 @@ def test_connection(self, test_engine: Engine, test_database: str) -> None:
             dbs = [x[0] for x in list(conn.execute(text('show databases')))]
             assert test_database in dbs, f'Database {test_database} not found in {dbs}'
 
-    def test_deferred_connection(self, base_connection_url: str) -> None:
+    def test_deferred_connection(self) -> None:
         """Test deferred connection functionality."""
         # Skip this test if using Docker (no external URL to defer to)
         if not os.environ.get('SINGLESTOREDB_URL'):