From 50aeb9a23416274e5619a0cb143b523777aa350a Mon Sep 17 00:00:00 2001
From: Rishabh Srivastava <rishabhsriv@gmail.com>
Date: Mon, 16 Sep 2024 16:45:00 +0800
Subject: [PATCH] remove compulsory requirement to add "database" field to
 sqlserver

---
 defog/__init__.py   | 2 --
 defog/query.py      | 2 +-
 setup.py            | 2 +-
 tests/test_defog.py | 1 -
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/defog/__init__.py b/defog/__init__.py
index e064d82..43ac9c1 100644
--- a/defog/__init__.py
+++ b/defog/__init__.py
@@ -176,8 +176,6 @@ def check_db_creds(db_type: str, db_creds: dict):
         elif db_type == "sqlserver":
             if "server" not in db_creds:
                 raise KeyError("db_creds must contain a 'server' key.")
-            if "database" not in db_creds:
-                raise KeyError("db_creds must contain a 'database' key.")
             if "user" not in db_creds:
                 raise KeyError("db_creds must contain a 'user' key.")
             if "password" not in db_creds:
diff --git a/defog/query.py b/defog/query.py
index 1712aae..9cde481 100644
--- a/defog/query.py
+++ b/defog/query.py
@@ -127,7 +127,7 @@ def execute_query_once(db_type: str, db_creds, query: str):
         except:
             raise Exception("pyodbc not installed.")
 
-        if db_creds["database"] != "":
+        if "database" in db_creds and db_creds["database"] != "":
             connection_string = f"DRIVER={{ODBC Driver 18 for SQL Server}};SERVER={db_creds['server']};DATABASE={db_creds['database']};UID={db_creds['user']};PWD={db_creds['password']};TrustServerCertificate=yes;Connection Timeout=120;"
         else:
             connection_string = f"DRIVER={{ODBC Driver 18 for SQL Server}};SERVER={db_creds['server']};UID={db_creds['user']};PWD={db_creds['password']};TrustServerCertificate=yes;Connection Timeout=120;"
diff --git a/setup.py b/setup.py
index 3b16dc7..39249f9 100644
--- a/setup.py
+++ b/setup.py
@@ -26,7 +26,7 @@ def package_files(directory):
     name="defog",
     packages=find_packages(),
     package_data={"defog": ["gcp/*", "aws/*"] + next_static_files},
-    version="0.65.17",
+    version="0.65.19",
     description="Defog is a Python library that helps you generate data queries from natural language questions.",
     author="Full Stack Data Pte. Ltd.",
     license="MIT",
diff --git a/tests/test_defog.py b/tests/test_defog.py
index 0ae6ee0..987e656 100644
--- a/tests/test_defog.py
+++ b/tests/test_defog.py
@@ -201,7 +201,6 @@ def test_check_db_creds_mongo(self):
     def test_check_db_creds_sqlserver(self):
         db_creds = {
             "server": "some_server",
-            "database": "some_database",
             "user": "some_user",
             "password": "some_password",
         }