Use http if key and https_pem not set.

laodouya · laodouya · commit dd822f72248f · 2019-02-01T19:07:19.000+08:00
diff --git a/example.py b/example.py
@@ -3,26 +3,26 @@
 
 import pycovenantsql
 
-key = 'write.dba.data.covenantsql.io.key'
-proxy_pem = 'write.dba.data.covenantsql.io.pem'
-
 
 print(pycovenantsql.get_client_info())
 
-conn = pycovenantsql.connect(dsn='covenant://053d0bb19637ffc7b4a94e3c79cc71b67a768813b09e4b67f1d6159902754a8b',
-        host="e.morenodes.com", port=11108, https_pem=proxy_pem,
-        key=key, database='053d0bb19637ffc7b4a94e3c79cc71b67a768813b09e4b67f1d6159902754a8b')
+conn = pycovenantsql.connect(dsn='covenant://0a10b74439f2376d828c9a70fd538dac4b69e0f4065424feebc0f5dbc8b34872',
+        host="adp00.cn.gridb.io", port=7784, database='0a10b74439f2376d828c9a70fd538dac4b69e0f4065424feebc0f5dbc8b34872')
 
 cur = conn.cursor()
 print(cur.description)
 
-#cur.execute('''create table test_python_driver(
-#        name text not null,
-#        primary key(name)
-#        )''')
+cur.execute('''create table if not exists test_python_driver(
+        name text not null,
+        primary key(name)
+        )''')
+print(cur.description)
 cur.execute("replace into test_python_driver values('test'), ('test2'), ('test3'), ('test4')")
+print(cur.description)
 cur.execute(" SELECT * FROM test_python_driver")
+print(cur.description)
 cur.execute("desc test_python_driver")
+print(cur.description)
 for row in cur:
     print(row)
 cur.execute("show tables")
diff --git a/pycovenantsql/connections.py b/pycovenantsql/connections.py
@@ -83,9 +83,20 @@ def _config(key, arg):
         self.port = port or 11108
         self.key = key
         self.database = database
+        if https_pem:
+            self._cert = (https_pem, self.key)
+        elif self.key:
+            self._cert = self.key
+        else:
+            self._cert = None
+
+        if self._cert:
+            self._query_uri = "https://" + self.host + ":" + str(self.port) + "/v1/query"
+            self._exec_uri = "https://" + self.host + ":" + str(self.port) + "/v1/exec"
+        else:
+            self._query_uri = "http://" + self.host + ":" + str(self.port) + "/v1/query"
+            self._exec_uri = "http://" + self.host + ":" + str(self.port) + "/v1/exec"
 
-        self._query_uri = "https://" + self.host + ":" + str(self.port) + "/v1/query"
-        self._exec_uri = "https://" + self.host + ":" + str(self.port) + "/v1/exec"
         if VERBOSE:
             try:
                 import http.client as http_client
@@ -94,10 +105,6 @@ def _config(key, arg):
                 import httplib as http_client
             http_client.HTTPConnection.debuglevel = 1
         requests.packages.urllib3.disable_warnings()
-        if https_pem:
-            self._cert = (https_pem, self.key)
-        else:
-            self._cert = self.key
 
         self.timeout = None
         if connect_timeout is not None and connect_timeout <= 0:
@@ -226,7 +233,8 @@ def _execute_command(self, sql):
     def _send(self, uri, data):
         session = requests.Session()
         session.verify = False
-        session.cert = self._cert
+        if self._cert:
+            session.cert = self._cert
         return session.post(uri, data, timeout=self.timeout)
 
     def escape(self, obj, mapping=None):
