Parse rowset and tests

Author: danielebriggi

src/sqlitecloud/client.py

@@ -2,16 +2,25 @@
 
 """
 from typing import Any, List, Optional
+from urllib import parse
 
 from sqlitecloud.driver import Driver
-from sqlitecloud.types import SQCloudConfig, SQCloudConnect, SqliteCloudAccount
+from sqlitecloud.resultset import SqliteCloudResultSet
+from sqlitecloud.types import (
+    SQCloudConfig,
+    SQCloudConnect,
+    SQCloudException,
+    SqliteCloudAccount,
+)
 
 
 class SqliteCloudClient:
     """
     Client to connect to SqliteCloud
     """
 
+    SQLITE_DEFAULT_PORT = 8860
+
     def __init__(
         self,
         cloud_account: Optional[SqliteCloudAccount] = None,
@@ -28,22 +37,15 @@ def __init__(
 
         """
         self.driver = Driver()
-        
-        self.hostname: str = ''
-        self.port: int = 8860
-        
+
         self.config = SQCloudConfig()
 
         # for pb in pub_subs:
         #     self._pub_sub_cbs.append(("channel1", SQCloudPubSubCB(pb)))
         if connection_str:
-            # TODO: parse connection string to create the config
-            self.config = SQCloudConfig()
+            self.config = self._parse_connection_string(connection_str)
         elif cloud_account:
             self.config.account = cloud_account
-            self.hostname = cloud_account.hostname
-            self.port = cloud_account.port
-
         else:
             raise Exception("Missing connection parameters")
 
@@ -56,7 +58,9 @@ def open_connection(self) -> SQCloudConnect:
         Raises:
             Exception: If an error occurs while opening the connection.
         """
-        connection = self.driver.connect(self.hostname, self.port, self.config)
+        connection = self.driver.connect(
+            self.config.account.hostname, self.config.account.port, self.config
+        )
 
         # SQCloudExec(connection, f"USE DATABASE {self.dbname};")
 
@@ -75,9 +79,9 @@ def disconnect(self, conn: SQCloudConnect) -> None:
         """
         self.driver.disconnect(conn)
 
-    # def exec_query(
-    #     self, query: str, conn: SQCloudConnect = None
-    # ) -> SqliteCloudResultSet:
+    def exec_query(
+        self, query: str, conn: SQCloudConnect = None
+    ) -> SqliteCloudResultSet:
         """Executes a SQL query on the SQLite database.
 
         Args:
@@ -86,31 +90,82 @@ def disconnect(self, conn: SQCloudConnect) -> None:
         Returns:
             SqliteCloudResultSet: The result set of the executed query.
         """
-        # print(query)
-        # # pylint: disable=unused-variable
-        # local_conn, close_at_end = (
-        #     (conn, False) if conn else (self.open_connection(), True)
-        # )
-        # result: SQCloudResult = SQCloudExec(local_conn, self._encode_str_to_c(query))
-        # self._check_connection(local_conn)
-        # return SqliteCloudResultSet(result)
-        # pass
+        if not conn:
+            conn = self.open_connection()
+
+        result = self.driver.execute(query, conn)
+        return SqliteCloudResultSet(result)
 
     # def exec_statement(
     #     self, query: str, values: List[Any], conn: SQCloudConnect = None
     # ) -> SqliteCloudResultSet:
-        # local_conn = conn if conn else self.open_connection()
-        # result: SQCloudResult = SQCloudExecArray(
-        #     local_conn,
-        #     self._encode_str_to_c(query),
-        #     [SqlParameter(self._encode_str_to_c(str(v)), v) for v in values],
-        # )
-        # if SQCloudResultIsError(result):
-        #     raise Exception(
-        #         "Query error: " + str(SQCloudResultDump(local_conn, result))
-        #     )
-        # return SqliteCloudResultSet(result)
-        # pass
+    # local_conn = conn if conn else self.open_connection()
+    # result: SQCloudResult = SQCloudExecArray(
+    #     local_conn,
+    #     self._encode_str_to_c(query),
+    #     [SqlParameter(self._encode_str_to_c(str(v)), v) for v in values],
+    # )
+    # if SQCloudResultIsError(result):
+    #     raise Exception(
+    #         "Query error: " + str(SQCloudResultDump(local_conn, result))
+    #     )
+    # return SqliteCloudResultSet(result)
+    # pass
 
     def sendblob(self):
         pass
+
+    def _parse_connection_string(self, connection_string) -> SQCloudConfig:
+        # URL STRING FORMAT
+        # sqlitecloud://user:pass@host.com:port/dbname?timeout=10&key2=value2&key3=value3
+        # or sqlitecloud://host.sqlite.cloud:8860/dbname?apikey=zIiAARzKm9XBVllbAzkB1wqrgijJ3Gx0X5z1A4m4xBA
+
+        config = SQCloudConfig()
+        config.account = SqliteCloudAccount()
+
+        try:
+            params = parse.urlparse(connection_string)
+
+            options = {}
+            query = params.query
+            options = parse.parse_qs(query)
+            for option, values in options.items():
+                opt = option.lower()
+                value = values.pop()
+
+                if value.lower() in ["true", "false"]:
+                    value = bool(value)
+                elif value.isdigit():
+                    value = int(value)
+                else:
+                    value = value
+
+                if hasattr(config, opt):
+                    setattr(config, opt, value)
+                elif hasattr(config.account, opt):
+                    setattr(config.account, opt, value)
+
+            # apikey or username/password is accepted
+            if not config.account.apikey:
+                config.account.username = (
+                    parse.unquote(params.username) if params.username else ""
+                )
+                config.account.password = (
+                    parse.unquote(params.password) if params.password else ""
+                )
+
+            path = params.path
+            database = path.strip("/")
+            if database:
+                config.account.database = database
+
+            config.account.hostname = params.hostname
+            config.account.port = (
+                int(params.port) if params.port else self.SQLITE_DEFAULT_PORT
+            )
+
+            return config
+        except Exception as e:
+            raise SQCloudException(
+                f"Invalid connection string {connection_string}"
+            ) from e