Merge branch 'master' into xdist_poc

Conflicts:
	lib/sqlalchemy/engine/url.py

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/sqlalchemy/engine/url.py b/lib/sqlalchemy/engine/url.py
index 116a3a343..6544cfbf3 100644
--- a/lib/sqlalchemy/engine/url.py
+++ b/lib/sqlalchemy/engine/url.py
@@ -111,6 +111,12 @@ class URL(object):
         else:
             return self.drivername.split('+')[0]
 
+    def get_driver_name(self):
+        if '+' not in self.drivername:
+            return self.get_dialect().driver
+        else:
+            return self.drivername.split('+')[1]
+
     def get_dialect(self):
         """Return the SQLAlchemy database dialect class corresponding
         to this URL's driver name.