update

backend/app/database.py

@@ -12,15 +12,16 @@ except ImportError:
 
 # Get database URL from environment variable
 # Default to SQLite for local development if not set
-DATABASE_URL = os.getenv(
+ORIGINAL_DATABASE_URL = os.getenv(
     "DATABASE_URL",
     "sqlite:///./postgen.db"
 )
+DATABASE_URL = ORIGINAL_DATABASE_URL
 
 # For CockroachDB, we need to handle SSL and connection pooling
-if DATABASE_URL.startswith("postgresql://") or DATABASE_URL.startswith("postgres://"):
-    # Check if this is a CockroachDB connection
-    is_cockroach = "cockroachlabs" in DATABASE_URL.lower()
+if ORIGINAL_DATABASE_URL.startswith("postgresql://") or ORIGINAL_DATABASE_URL.startswith("postgres://") or ORIGINAL_DATABASE_URL.startswith("cockroachdb://"):
+    # Check if this is a CockroachDB connection (use original URL before modifications)
+    is_cockroach = "cockroachlabs" in ORIGINAL_DATABASE_URL.lower()
     
     # CockroachDB connection - use NullPool to avoid connection issues
     # CockroachDB requires SSL, so we ensure sslmode is set
@@ -86,78 +87,106 @@ def init_db():
             # Check if it's a version parsing error (non-fatal for CockroachDB)
             if "Could not determine version" in error_str:
                 # Version parsing failed, but CockroachDB connection works
-                # Try to create tables using raw SQL to bypass version check
+                # Use psycopg2 directly to bypass SQLAlchemy's version parsing
                 try:
-                    # Use raw connection to create tables
-                    with engine.raw_connection() as raw_conn:
-                        cursor = raw_conn.cursor()
-                        # Create tables using IF NOT EXISTS
-                        tables_sql = [
-                            """CREATE TABLE IF NOT EXISTS users (
-                                id SERIAL PRIMARY KEY,
-                                email VARCHAR UNIQUE,
-                                name VARCHAR,
-                                created_at TIMESTAMP DEFAULT NOW()
-                            )""",
-                            """CREATE TABLE IF NOT EXISTS integrations (
-                                id SERIAL PRIMARY KEY,
-                                user_id INTEGER REFERENCES users(id),
-                                provider VARCHAR,
-                                access_token TEXT,
-                                refresh_token TEXT,
-                                expires_at TIMESTAMP,
-                                account_info JSONB,
-                                connected BOOLEAN DEFAULT FALSE,
-                                created_at TIMESTAMP DEFAULT NOW(),
-                                updated_at TIMESTAMP DEFAULT NOW()
-                            )""",
-                            """CREATE TABLE IF NOT EXISTS assets (
-                                id SERIAL PRIMARY KEY,
-                                user_id INTEGER REFERENCES users(id),
-                                name VARCHAR,
-                                file_path VARCHAR,
-                                file_type VARCHAR,
-                                product_category VARCHAR,
-                                sub_category VARCHAR,
-                                size INTEGER,
-                                extra_metadata JSONB,
-                                created_at TIMESTAMP DEFAULT NOW()
-                            )""",
-                            """CREATE TABLE IF NOT EXISTS posts (
-                                id SERIAL PRIMARY KEY,
-                                user_id INTEGER REFERENCES users(id),
-                                title VARCHAR,
-                                content TEXT,
-                                post_type VARCHAR,
-                                product_category VARCHAR,
-                                scheduled_date TIMESTAMP,
-                                status VARCHAR,
-                                linkedin_post_id VARCHAR,
-                                canva_design_id VARCHAR,
-                                assets JSONB,
-                                extra_metadata JSONB,
-                                created_at TIMESTAMP DEFAULT NOW(),
-                                updated_at TIMESTAMP DEFAULT NOW()
-                            )""",
-                            """CREATE TABLE IF NOT EXISTS campaigns (
-                                id SERIAL PRIMARY KEY,
-                                user_id INTEGER REFERENCES users(id),
-                                name VARCHAR,
-                                date_range_start TIMESTAMP,
-                                date_range_end TIMESTAMP,
-                                products JSONB,
-                                post_types JSONB,
-                                posts_per_week INTEGER,
-                                status VARCHAR,
-                                created_at TIMESTAMP DEFAULT NOW(),
-                                updated_at TIMESTAMP DEFAULT NOW()
-                            )"""
-                        ]
-                        for sql in tables_sql:
-                            cursor.execute(sql)
-                        raw_conn.commit()
-                        cursor.close()
-                    print("✓ CockroachDB tables created successfully (using raw SQL)")
+                    import psycopg2
+                    from urllib.parse import urlparse, parse_qs
+                    
+                    # Parse connection string to get connection parameters
+                    # Handle both cockroachdb:// and postgresql:// schemes
+                    # Use original URL before any modifications
+                    url_for_parsing = ORIGINAL_DATABASE_URL.replace("cockroachdb://", "postgresql://")
+                    parsed = urlparse(url_for_parsing)
+                    dbname = parsed.path[1:] if parsed.path else "defaultdb"
+                    user = parsed.username
+                    password = parsed.password
+                    host = parsed.hostname
+                    port = parsed.port or 26257
+                    
+                    # Get sslmode from query params (use require as default for CockroachDB)
+                    params = parse_qs(parsed.query)
+                    sslmode_list = params.get('sslmode', ['require'])
+                    sslmode = sslmode_list[0] if sslmode_list else 'require'
+                    
+                    # Connect directly with psycopg2 (bypasses SQLAlchemy version parsing)
+                    conn = psycopg2.connect(
+                        dbname=dbname,
+                        user=user,
+                        password=password,
+                        host=host,
+                        port=port,
+                        sslmode=sslmode
+                    )
+                    
+                    cursor = conn.cursor()
+                    # Create tables using IF NOT EXISTS
+                    tables_sql = [
+                        """CREATE TABLE IF NOT EXISTS users (
+                            id SERIAL PRIMARY KEY,
+                            email VARCHAR UNIQUE,
+                            name VARCHAR,
+                            created_at TIMESTAMP DEFAULT NOW()
+                        )""",
+                        """CREATE TABLE IF NOT EXISTS integrations (
+                            id SERIAL PRIMARY KEY,
+                            user_id INTEGER REFERENCES users(id),
+                            provider VARCHAR,
+                            access_token TEXT,
+                            refresh_token TEXT,
+                            expires_at TIMESTAMP,
+                            account_info JSONB,
+                            connected BOOLEAN DEFAULT FALSE,
+                            created_at TIMESTAMP DEFAULT NOW(),
+                            updated_at TIMESTAMP DEFAULT NOW()
+                        )""",
+                        """CREATE TABLE IF NOT EXISTS assets (
+                            id SERIAL PRIMARY KEY,
+                            user_id INTEGER REFERENCES users(id),
+                            name VARCHAR,
+                            file_path VARCHAR,
+                            file_type VARCHAR,
+                            product_category VARCHAR,
+                            sub_category VARCHAR,
+                            size INTEGER,
+                            extra_metadata JSONB,
+                            created_at TIMESTAMP DEFAULT NOW()
+                        )""",
+                        """CREATE TABLE IF NOT EXISTS posts (
+                            id SERIAL PRIMARY KEY,
+                            user_id INTEGER REFERENCES users(id),
+                            title VARCHAR,
+                            content TEXT,
+                            post_type VARCHAR,
+                            product_category VARCHAR,
+                            scheduled_date TIMESTAMP,
+                            status VARCHAR,
+                            linkedin_post_id VARCHAR,
+                            canva_design_id VARCHAR,
+                            assets JSONB,
+                            extra_metadata JSONB,
+                            created_at TIMESTAMP DEFAULT NOW(),
+                            updated_at TIMESTAMP DEFAULT NOW()
+                        )""",
+                        """CREATE TABLE IF NOT EXISTS campaigns (
+                            id SERIAL PRIMARY KEY,
+                            user_id INTEGER REFERENCES users(id),
+                            name VARCHAR,
+                            date_range_start TIMESTAMP,
+                            date_range_end TIMESTAMP,
+                            products JSONB,
+                            post_types JSONB,
+                            posts_per_week INTEGER,
+                            status VARCHAR,
+                            created_at TIMESTAMP DEFAULT NOW(),
+                            updated_at TIMESTAMP DEFAULT NOW()
+                        )"""
+                    ]
+                    for sql in tables_sql:
+                        cursor.execute(sql)
+                    conn.commit()
+                    cursor.close()
+                    conn.close()
+                    print("✓ CockroachDB tables created successfully (using direct psycopg2 connection)")
                     return True
                 except Exception as raw_error:
                     print(f"⚠ Table creation failed: {raw_error}")