Instantiate connector inside cursors

Author: jsancho-gpl

datasette_connectors/__init__.py

@@ -1,2 +1,3 @@
 from .connectors import Connector
+from .connection import Connection
 from .cursor import OperationalError

datasette_connectors/connection.py

@@ -2,9 +2,9 @@
 
 
 class Connection:
-    def __init__(self, path, connector):
+    def __init__(self, path, connector_class):
         self.path = path
-        self.connector = connector
+        self.connector_class = connector_class
 
     def execute(self, *args, **kwargs):
         cursor = Cursor(self)

datasette_connectors/connectors.py

@@ -32,8 +32,12 @@ class Connector:
     connector_type = None
     connection_class = Connection
 
-    def connect(self, path):
-        return self.connection_class(path, self)
+    @classmethod
+    def connect(cls, path):
+        return cls.connection_class(path, cls)
+
+    def __init__(self, conn):
+        self.conn = conn
 
     def table_names(self):
         """

datasette_connectors/cursor.py

@@ -14,7 +14,7 @@ class QueryNotSupported(Exception):
 
     def __init__(self, conn):
         self.conn = conn
-        self.connector = conn.connector
+        self.connector = conn.connector_class(conn)
         self.rows = []
         self.description = ()
 

tests/fixtures.py

@@ -1,7 +1,7 @@
 from datasette_connectors import monkey; monkey.patch_datasette()
 from datasette_connectors.connectors import ConnectorList
 from .dummy import DummyConnector
-ConnectorList.add_connector('dummy', DummyConnector())
+ConnectorList.add_connector('dummy', DummyConnector)
 
 from datasette.app import Datasette
 from datasette.utils.testing import TestClient