--- vbtodrupal.module	2009-05-18 04:03:20.000000000 +0200
+++ vbtodrupal.new.module	2009-10-27 01:34:26.531250000 +0100
@@ -409,6 +409,12 @@ function _vbtodrupal_db_setup() {
   // Get the Drupal db name from db_url
   $drupal_db_name = explode('/', $db_url['default']);
   $drupal_db_name = $drupal_db_name[count($drupal_db_name)-1];
+
+  // Backticks to allow database names with hyphens, reserved words...
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
+    $drupal_db_name = '`' . $drupal_db_name . '`';
+  }
+
   $drupal_db_prefix = variable_get('vbtodrupal_default_db_prefix', $db_prefix);
   db_set_active('vb');
   return array(
@@ -1257,6 +1263,12 @@ function _vbtodrupal_fixorphans() {
   global $db_url;
   $db_name = explode('/', $db_url['vb']);
   $db_name = $db_name[count($db_name)-1];
+
+  // Backticks to allow database names with hyphens, reserved words...
+  if ($GLOBALS['db_type'] == 'mysql' || $GLOBALS['db_type'] == 'mysqli') {
+    $db_name = '`' . $db_name . '`';
+  }
+
   $db_prefix = variable_get('vbtodrupal_db_prefix', '');
 
   db_query("INSERT INTO {uid_linker} (drupal_uid, vb_uid, vb_uid_orig, name)