From 1fe2fdea167d078bf58a5e751ed3587d98f97904 Mon Sep 17 00:00:00 2001
From: Sergey Tsalkov <stsalkov@gmail.com>
Date: Sun, 26 Oct 2014 01:57:20 +0000
Subject: [PATCH] when an instance of MeekroDB is created, its default settings
 will be those of the static instance

---
 db.class.php | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/db.class.php b/db.class.php
index 2a69fae..7d8976b 100644
--- a/db.class.php
+++ b/db.class.php
@@ -41,6 +41,8 @@ class DB {
   
   // internal
   protected static $mdb = null;
+  public static $variables_to_sync = array('param_char', 'escape_char', 'named_param_seperator', 'success_handler', 'error_handler', 'throw_exception_on_error',
+    'nonsql_error_handler', 'throw_exception_on_nonsql_error', 'nested_transactions', 'usenull', 'ssl', 'connect_options');
   
   public static function getMDB() {
     $mdb = DB::$mdb;
@@ -49,16 +51,8 @@ class DB {
       $mdb = DB::$mdb = new MeekroDB();
     }
 
-    static $variables_to_sync = array('param_char', 'named_param_seperator', 'success_handler', 'error_handler', 'throw_exception_on_error',
-      'nonsql_error_handler', 'throw_exception_on_nonsql_error', 'nested_transactions', 'usenull', 'ssl', 'connect_options');
-
-    $db_class_vars = get_class_vars('DB'); // the DB::$$var syntax only works in 5.3+
-
-    foreach ($variables_to_sync as $variable) {
-      if ($mdb->$variable !== $db_class_vars[$variable]) {
-        $mdb->$variable = $db_class_vars[$variable];
-      }
-    }
+    // Sync everytime because settings might have changed. It's fast.
+    $mdb->sync_config(); 
     
     return $mdb;
   }
@@ -158,6 +152,19 @@ class MeekroDB {
     $this->dbName = $dbName;
     $this->port = $port;
     $this->encoding = $encoding;
+
+    $this->sync_config();
+  }
+
+  // suck in config settings from static class
+  public function sync_config() {
+    $db_class_vars = get_class_vars('DB'); // the DB::$$var syntax only works in 5.3+
+
+    foreach (DB::$variables_to_sync as $variable) {
+      if ($this->$variable !== $db_class_vars[$variable]) {
+        $this->$variable = $db_class_vars[$variable];
+      }
+    }
   }
   
   public function get() {