From 3e80b68303edbae7d80f9cbe0b9495973c85fbf4 Mon Sep 17 00:00:00 2001
From: ArnAud <arnaud.cordier@openedition.org>
Date: Wed, 27 May 2015 11:57:16 +0200
Subject: [PATCH] =?UTF-8?q?connection=20=C3=A0=20une=20base=20de=20donn?=
 =?UTF-8?q?=C3=A9e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Database/sqlsettings.py |  4 ++--
 Database/sqlwrapper.py  | 10 +++++-----
 requirements.txt        |  1 +
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Database/sqlsettings.py b/Database/sqlsettings.py
index ff4c832..ae07a6c 100644
--- a/Database/sqlsettings.py
+++ b/Database/sqlsettings.py
@@ -11,8 +11,8 @@ class SQLSettings(object):
         },
         'mysql': {
             # TODO à définir
-            'driver': '',
-            'encoding': '',
+            'driver': 'pymysql',
+            'encoding': 'utf8',
         }
     }
 
diff --git a/Database/sqlwrapper.py b/Database/sqlwrapper.py
index 62bea84..0fbbef0 100644
--- a/Database/sqlwrapper.py
+++ b/Database/sqlwrapper.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 from sqlalchemy import * # TODO ajuster les classes à importer
-from sql_settings import SqlSettings as sqlsettings
+from Database.sqlsettings import SQLSettings as sqlsettings
 from django.conf import settings
 import re
 
@@ -33,13 +33,13 @@ class SqlWrapper(object):
         driver = sqlsettings.dbms_list[dialect]['driver']
         username = connection_params['USER']
         password = connection_params['PASSWORD']
-        hostname = connection_params['HOST'] if connection_params['HOST']!='' else sqlsettings.DEFAULT_HOSTNAME
-        port = connection_params['PORT']
+        hostname = connection_params['HOST'] if 'HOST' in connection_params else sqlsettings.DEFAULT_HOSTNAME
+        port = connection_params['PORT'] if 'PORT' in connection_params else ''
         host = hostname if port=='' else '%s:%s' % (hostname, port)
         database = connection_params['NAME']
 
         connection_string = '%s+%s://%s:%s@%s/%s' % (dialect, driver, username, password, host, database)
-        engine = create_engine(connection_string, encoding=sqlsettings.dbms_list[dialect]['encoding'], echo=True, poolclass=NullPool)
+        engine = create_engine(connection_string, encoding=sqlsettings.dbms_list[dialect]['encoding'], echo=True)
         return engine
 
     def get_read_engine(self):
@@ -130,7 +130,7 @@ class SqlWrapper(object):
         elif column_type=='BOOLEAN':
             column = Column(column_name, BOOLEAN)
 
-        if column and column_extra:
+        if column is not None and column_extra:
             if 'nullable' in column_extra:
                 column.nullable = column_extra['nullable']
             if 'primarykey' in column_extra:
diff --git a/requirements.txt b/requirements.txt
index 7bfa7b5..8308d57 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 Django==1.7.8
 psycopg2==2.6
 SQLAlchemy==1.0.4
+PyMySQL==0.6.6