[update] connector uses PDO by defaultHEADorigin/masterorigin/HEADmaster

65 files changed, 81 insertions, 312 deletions

diff --git a/codebase/base_connector.php b/codebase/base_connector.php
index cb44b15..622fb17 100755
--- a/codebase/base_connector.php
+++ b/codebase/base_connector.php
@@ -330,7 +330,7 @@ class Connector {
 	public function __construct($db,$type=false, $item_type=false, $data_type=false, $render_type = false){
 		$this->exec_time=microtime(true);
 
-		if (!$type) $type="MySQL";
+		if (!$type) $type="PDO";
 		if (class_exists($type."DBDataWrapper",false)) $type.="DBDataWrapper";
 		if (!$item_type) $item_type="DataItem";
 		if (!$data_type) $data_type="DataProcessor";
diff --git a/codebase/db_common.php b/codebase/db_common.php
index eddc7ad..3650cfa 100755
--- a/codebase/db_common.php
+++ b/codebase/db_common.php
@@ -1100,69 +1100,6 @@ class ArrayQueryWrapper{
 		$this->index = 0;
 	}
 }
-/*! Implementation of DataWrapper for MySQL
-**/
-class MySQLDBDataWrapper extends DBDataWrapper{
-	protected $last_result;
-	public function query($sql){
-		LogMaster::log($sql);
-		$res=mysql_query($sql,$this->connection);
-		if ($res===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
-		$this->last_result = $res;
-		return $res;
-	}
-	
-	public function get_next($res){
-		if (!$res)
-			$res = $this->last_result;
-			
-		return mysql_fetch_assoc($res);
-	}
-	
-	public function get_new_id(){
-		return mysql_insert_id($this->connection);
-	}
-	
-	public function escape($data){
-		return mysql_real_escape_string($data, $this->connection);
-	}
 
-	public function tables_list() {
-		$result = mysql_query("SHOW TABLES");
-		if ($result===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
-
-		$tables = array();
-		while ($table = mysql_fetch_array($result)) {
-			$tables[] = $table[0];
-		}
-		return $tables;
-	}
-
-	public function fields_list($table) {
-		$result = mysql_query("SHOW COLUMNS FROM `".$table."`");
-		if ($result===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
-
-		$fields = array();
-        $id = "";
-		while ($field = mysql_fetch_assoc($result)) {
-			if ($field['Key'] == "PRI")
-				$id = $field["Field"];
-            else
-			    $fields[] = $field["Field"];
-		}
-		return array("fields" => $fields, "key" => $id );
-	}
-	
-	/*! escape field name to prevent sql reserved words conflict
-		@param data 
-			unescaped data
-		@return 
-			escaped data
-	*/
-	public function escape_name($data){
-		if ((strpos($data,"`")!==false || is_int($data)) || (strpos($data,".")!==false))
-			return $data;
-		return '`'.$data.'`';
-	}	
-}
+include_once(__DIR__."/db_pdo.php");
 ?>
\ No newline at end of file
diff --git a/codebase/db_mysql.php b/codebase/db_mysql.php
new file mode 100644
index 0000000..d31d210
--- /dev/null
+++ b/codebase/db_mysql.php
@@ -0,0 +1,67 @@
+<?php
+
+/*! Implementation of DataWrapper for MySQL
+**/
+class MySQLDBDataWrapper extends DBDataWrapper{
+	protected $last_result;
+	public function query($sql){
+		LogMaster::log($sql);
+		$res=mysql_query($sql,$this->connection);
+		if ($res===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
+		$this->last_result = $res;
+		return $res;
+	}
+	
+	public function get_next($res){
+		if (!$res)
+			$res = $this->last_result;
+			
+		return mysql_fetch_assoc($res);
+	}
+	
+	public function get_new_id(){
+		return mysql_insert_id($this->connection);
+	}
+	
+	public function escape($data){
+		return mysql_real_escape_string($data, $this->connection);
+	}
+
+	public function tables_list() {
+		$result = mysql_query("SHOW TABLES");
+		if ($result===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
+
+		$tables = array();
+		while ($table = mysql_fetch_array($result)) {
+			$tables[] = $table[0];
+		}
+		return $tables;
+	}
+
+	public function fields_list($table) {
+		$result = mysql_query("SHOW COLUMNS FROM `".$table."`");
+		if ($result===false) throw new Exception("MySQL operation failed\n".mysql_error($this->connection));
+
+		$fields = array();
+        $id = "";
+		while ($field = mysql_fetch_assoc($result)) {
+			if ($field['Key'] == "PRI")
+				$id = $field["Field"];
+            else
+			    $fields[] = $field["Field"];
+		}
+		return array("fields" => $fields, "key" => $id );
+	}
+	
+	/*! escape field name to prevent sql reserved words conflict
+		@param data 
+			unescaped data
+		@return 
+			escaped data
+	*/
+	public function escape_name($data){
+		if ((strpos($data,"`")!==false || is_int($data)) || (strpos($data,".")!==false))
+			return $data;
+		return '`'.$data.'`';
+	}	
+}
\ No newline at end of file
diff --git a/codebase/mixed_connector.php b/codebase/mixed_connector.php
index bbef8d4..99edf86 100644
--- a/codebase/mixed_connector.php
+++ b/codebase/mixed_connector.php
@@ -18,7 +18,6 @@ class MixedConnector extends Connector {
 
     public function add($name, $conn) {
         $this->connectors[$name] = $conn;
-        $conn->simple = true;
     }
 
     public function render() {
diff --git a/samples/combo/01_basic_connector.php b/samples/combo/01_basic_connector.php
index 1ef8df4..847c9df 100644
--- a/samples/combo/01_basic_connector.php
+++ b/samples/combo/01_basic_connector.php
@@ -1,5 +1,4 @@
 <?php
-	require_once("../../codebase/db_pdo.php");
 	require_once("../config.php");
 	
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
diff --git a/samples/combo/01_basic_srnd_connector.php b/samples/combo/01_basic_srnd_connector.php
index 8764723..baf670a 100644
--- a/samples/combo/01_basic_srnd_connector.php
+++ b/samples/combo/01_basic_srnd_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/combo/02_sql_connector.php b/samples/combo/02_sql_connector.php
index cf0e559..1d5a1a1 100644
--- a/samples/combo/02_sql_connector.php
+++ b/samples/combo/02_sql_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/combo/02_sql_srnd_connector.php b/samples/combo/02_sql_srnd_connector.php
index 311531d..62ee99b 100644
--- a/samples/combo/02_sql_srnd_connector.php
+++ b/samples/combo/02_sql_srnd_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/common/01_mixin_connector.php b/samples/common/01_mixin_connector.php
index b03374b..0adbc32 100644
--- a/samples/common/01_mixin_connector.php
+++ b/samples/common/01_mixin_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
@@ -15,7 +14,7 @@
 	$data2 = new JSONTreeDataConnector($res, "PDO");
 	$data2->configure("tasks","taskId","taskName","","parentId");
 
-	$conn = new MixedConnector($res, "PDO");
+	$conn = new MixedConnector("json");
 	$conn->add("country_data", $data1);
 	$conn->add("countries", $data2);
 	$conn->render();
diff --git a/samples/common/02_easyfilter_connector.php b/samples/common/02_easyfilter_connector.php
index 0d7c35c..a002aab 100644
--- a/samples/common/02_easyfilter_connector.php
+++ b/samples/common/02_easyfilter_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/common/03_easysort_connector.php b/samples/common/03_easysort_connector.php
index 7441352..495796f 100644
--- a/samples/common/03_easysort_connector.php
+++ b/samples/common/03_easysort_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/common/04_mix_connector.php b/samples/common/04_mix_connector.php
index 5ad31c9..7c28802 100644
--- a/samples/common/04_mix_connector.php
+++ b/samples/common/04_mix_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/common/05_asstring_connector.php b/samples/common/05_asstring_connector.php
index 53e3d47..bb44278 100644
--- a/samples/common/05_asstring_connector.php
+++ b/samples/common/05_asstring_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/dataview/01_static_loading.php b/samples/dataview/01_static_loading.php
index 10b8ee6..337ccbb 100644
--- a/samples/dataview/01_static_loading.php
+++ b/samples/dataview/01_static_loading.php
@@ -1,5 +1,4 @@
 <?php
-	require_once("../../codebase/db_pdo.php");
 	require_once("../../codebase/dataview_connector.php");
 	require_once("../config.php");
 	
diff --git a/samples/dataview/02_dynamic_loading.php b/samples/dataview/02_dynamic_loading.php
index 858c2b7..46d635f 100644
--- a/samples/dataview/02_dynamic_loading.php
+++ b/samples/dataview/02_dynamic_loading.php
@@ -1,6 +1,4 @@
 <?php
-
-	require_once("../../codebase/db_pdo.php");
 	require_once("../../codebase/dataview_connector.php");
 	require_once("../config.php");
 	
diff --git a/samples/dataview/03_adding.php b/samples/dataview/03_adding.php
index 3bad14c..493d016 100644
--- a/samples/dataview/03_adding.php
+++ b/samples/dataview/03_adding.php
@@ -1,5 +1,4 @@
 <?php
-	require_once("../../codebase/db_pdo.php");
 	require_once("../../codebase/dataview_connector.php");
 	require_once("../config.php");
 	
diff --git a/samples/export/csv.php b/samples/export/csv.php
index b96c68f..c584ce6 100644
--- a/samples/export/csv.php
+++ b/samples/export/csv.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
@@ -12,9 +11,10 @@
 	$convert->excel();
 	
 	$grid = new GridConnector($res, "PDO");
+	$grid->set_limit(100);
 	$config = new GridConfiguration();
 	
 	$grid = new GridConnector($res, "PDO");
 	$grid->set_config($config);
-	$grid->render_table("grid50");
+	$grid->render_table("grid50000");
 ?>
\ No newline at end of file
diff --git a/samples/export/excel.php b/samples/export/excel.php
index 6c0f3f8..9313234 100644
--- a/samples/export/excel.php
+++ b/samples/export/excel.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
@@ -12,9 +11,10 @@
 	$convert->excel();
 	
 	$grid = new GridConnector($res, "PDO");
+	$grid->set_limit(100);
 	$config = new GridConfiguration();
 	
 	$grid = new GridConnector($res, "PDO");
 	$grid->set_config($config);
-	$grid->render_table("grid50");
+	$grid->render_table("grid50000");
 ?>
\ No newline at end of file
diff --git a/samples/export/html.php b/samples/export/html.php
index f083dec..b39046e 100644
--- a/samples/export/html.php
+++ b/samples/export/html.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
@@ -12,9 +11,10 @@
 	$convert->excel();
 
 	$grid = new GridConnector($res, "PDO");
+	$grid->set_limit(100);
 	$config = new GridConfiguration();
 	
 	$grid = new GridConnector($res, "PDO");
 	$grid->set_config($config);
-	$grid->render_table("grid50");
+	$grid->render_table("grid50000");
 ?>
\ No newline at end of file
diff --git a/samples/export/pdf.php b/samples/export/pdf.php
index 5a1bd9d..3a09724 100644
--- a/samples/export/pdf.php
+++ b/samples/export/pdf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
@@ -11,9 +10,10 @@
 	$convert = new ConvertService("http://dhtmlxgrid.appspot.com/export/pdf");
 	
 	$grid = new GridConnector($res, "PDO");
+	$grid->set_limit(100);
 	$config = new GridConfiguration();
 	
 	$config->set_convert_mode(true);
 	$grid->set_config($config);
-	$grid->render_table("grid50");
+	$grid->render_table("grid50000");
 ?>
\ No newline at end of file
diff --git a/samples/gantt/01_basic_init_connector.php b/samples/gantt/01_basic_init_connector.php
index 5675146..d9d0e42 100644
--- a/samples/gantt/01_basic_init_connector.php
+++ b/samples/gantt/01_basic_init_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	include ('../config.php');
-	require_once("../../codebase/db_pdo.php");
 	include ('../../codebase/gantt_connector.php');
 
     $res= new PDO($mysql_server,$mysql_user,$mysql_pass); 
diff --git a/samples/grid/01_basic_connector.php b/samples/grid/01_basic_connector.php
index 93d8007..72fdf2f 100644
--- a/samples/grid/01_basic_connector.php
+++ b/samples/grid/01_basic_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/grid/01a_sql_basic_connector.php b/samples/grid/01a_sql_basic_connector.php
index 66e0a3e..2c2ed6e 100644
--- a/samples/grid/01a_sql_basic_connector.php
+++ b/samples/grid/01a_sql_basic_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 
 	require("../../codebase/grid_connector.php");
diff --git a/samples/grid/02_rendering_connector.php b/samples/grid/02_rendering_connector.php
index 9c2ccb9..2c185df 100644
--- a/samples/grid/02_rendering_connector.php
+++ b/samples/grid/02_rendering_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/grid/03_validation_connector.php b/samples/grid/03_validation_connector.php
index 87343b9..13f8cd0 100644
--- a/samples/grid/03_validation_connector.php
+++ b/samples/grid/03_validation_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/grid/04_custom_sql_connector.php b/samples/grid/04_custom_sql_connector.php
index f0bed29..c1015be 100644
--- a/samples/grid/04_custom_sql_connector.php
+++ b/samples/grid/04_custom_sql_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/grid/05_select_filter_connector.php b/samples/grid/05_select_filter_connector.php
index 63690a9..8a33a97 100644
--- a/samples/grid/05_select_filter_connector.php
+++ b/samples/grid/05_select_filter_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	require("../../codebase/grid_connector.php");
diff --git a/samples/grid/05a_select_filter_connector.php b/samples/grid/05a_select_filter_connector.php
index a21dad3..a8600b6 100644
--- a/samples/grid/05a_select_filter_connector.php
+++ b/samples/grid/05a_select_filter_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	require("../../codebase/grid_connector.php");
diff --git a/samples/grid/06_combo_connector.php b/samples/grid/06_combo_connector.php
index 9029730..3dac5ba 100644
--- a/samples/grid/06_combo_connector.php
+++ b/samples/grid/06_combo_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	require("../../codebase/grid_connector.php");
diff --git a/samples/grid/09_server_side_configuration.php b/samples/grid/09_server_side_configuration.php
index 35d2304..f75d536 100644
--- a/samples/grid/09_server_side_configuration.php
+++ b/samples/grid/09_server_side_configuration.php
@@ -1,16 +1,16 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");	
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
 	require("../../codebase/grid_connector.php");
 	$grid = new GridConnector($res, "PDO");
+	$grid->set_limit(100);
 	
 	$config = new GridConfiguration();
 	$config->setHeader("ID,First Name,Last Name,Title,Office,Extn,Mobile,Email");
 	$config->setColTypes("ro,ed,ed,ed,ed,ed,ed,ed");
 	$grid->set_config($config);
    
-	$grid->render_table("grid50");
+	$grid->render_table("grid50000");
 ?>
\ No newline at end of file
diff --git a/samples/grid/10_auto_config.php b/samples/grid/10_auto_config.php
index ea78e8f..a1dcf33 100644
--- a/samples/grid/10_auto_config.php
+++ b/samples/grid/10_auto_config.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/grid/11_auto_config_filters.php b/samples/grid/11_auto_config_filters.php
index 63d7ed2..4eb8604 100644
--- a/samples/grid/11_auto_config_filters.php
+++ b/samples/grid/11_auto_config_filters.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/grid/12_attach_header_server.php b/samples/grid/12_attach_header_server.php
index b26d06e..cf09458 100644
--- a/samples/grid/12_attach_header_server.php
+++ b/samples/grid/12_attach_header_server.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/grid/some.txt b/samples/grid/some.txt
deleted file mode 100644
index fd5836e..0000000
--- a/samples/grid/some.txt
+++ /dev/null
@@ -1,178 +0,0 @@
-
-
-====================================
-Log started, 08/08/2014 02:11:30
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.0074200630187988s
-
-
-
-====================================
-Log started, 08/08/2014 02:13:34
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.0053791999816895s
-
-
-
-====================================
-Log started, 08/08/2014 02:17:52
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.0059990882873535s
-
-
-
-====================================
-Log started, 08/08/2014 02:17:54
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.0051469802856445s
-
-
-
-====================================
-Log started, 08/08/2014 02:29:44
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.004889965057373s
-
-
-
-====================================
-Log started, 08/08/2014 02:31:03
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.0049238204956055s
-
-
-
-====================================
-Log started, 18/08/2015 07:51:07
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.48602795600891s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:02
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.0069999694824219s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:03
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 1964,22
-
-Done in 0.004000186920166s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:05
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 3808,22
-
-Done in 0.0080001354217529s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:06
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 5376,22
-
-Done in 0.0070009231567383s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:06
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 6461,22
-
-Done in 0.0090007781982422s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:07
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 7323,22
-
-Done in 0.0090007781982422s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:08
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 3859,22
-
-Done in 0.0070011615753174s
-
-
-
-====================================
-Log started, 18/08/2015 08:01:09
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 1809,22
-
-Done in 0.0049998760223389s
-
-
-
-====================================
-Log started, 24/08/2015 07:19:36
-====================================
-
-SELECT item_id,item_nm,item_cd FROM grid50000 LIMIT 0,100
-
-SELECT COUNT(*) as DHX_COUNT  FROM grid50000
-
-Done in 0.012634992599487s
-
diff --git a/samples/grid/xx_sample_pdo_connector.php b/samples/grid/xx_sample_pdo_connector.php
index 2b202ce..eed2f3c 100644
--- a/samples/grid/xx_sample_pdo_connector.php
+++ b/samples/grid/xx_sample_pdo_connector.php
@@ -3,7 +3,6 @@
 	$dbh = new PDO('mysql:host='.$mysql_server.';dbname='.$mysql_db, $mysql_user, $mysql_pass);
 	
 	require("../../codebase/grid_connector.php");
-	require("../../codebase/db_pdo.php");
 	
 	$grid = new GridConnector($dbh,"PDO");
 	
diff --git a/samples/grid/xx_sample_pdo_pg_connector.php b/samples/grid/xx_sample_pdo_pg_connector.php
index 674c6b0..d2c4bb8 100644
--- a/samples/grid/xx_sample_pdo_pg_connector.php
+++ b/samples/grid/xx_sample_pdo_pg_connector.php
@@ -3,7 +3,6 @@
 	$dbh = new PDO('pgsql:host=localhost;dbname='.$mysql_db.";user=root;password=1234");
 	
 	require("../../codebase/grid_connector.php");
-	require("../../codebase/db_pdo.php");
 	
 	$grid = new GridConnector($dbh,"PDO");
 	
diff --git a/samples/scheduler/01_basic_init_connector.php b/samples/scheduler/01_basic_init_connector.php
index 97442fa..abfaf21 100644
--- a/samples/scheduler/01_basic_init_connector.php
+++ b/samples/scheduler/01_basic_init_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	include ('../config.php');
-	include ('../../codebase/db_pdo.php');
 	include ('../../codebase/scheduler_connector.php');
 
     $res= new PDO($mysql_server,$mysql_user,$mysql_pass); 
diff --git a/samples/scheduler/02_dynamic_loading_connector.php b/samples/scheduler/02_dynamic_loading_connector.php
index 97442fa..abfaf21 100644
--- a/samples/scheduler/02_dynamic_loading_connector.php
+++ b/samples/scheduler/02_dynamic_loading_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	include ('../config.php');
-	include ('../../codebase/db_pdo.php');
 	include ('../../codebase/scheduler_connector.php');
 
     $res= new PDO($mysql_server,$mysql_user,$mysql_pass); 
diff --git a/samples/scheduler/03_connector_options.php b/samples/scheduler/03_connector_options.php
index 29d5445..c229c11 100644
--- a/samples/scheduler/03_connector_options.php
+++ b/samples/scheduler/03_connector_options.php
@@ -1,5 +1,4 @@
 <?php
-	include ('../../codebase/db_pdo.php');
 	include ('../../codebase/scheduler_connector.php');
 	include ('../config.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
diff --git a/samples/scheduler/04_recurring_events_connector.php b/samples/scheduler/04_recurring_events_connector.php
index c370cff..b6154b4 100644
--- a/samples/scheduler/04_recurring_events_connector.php
+++ b/samples/scheduler/04_recurring_events_connector.php
@@ -1,8 +1,6 @@
 <?php
 	include ('../config.php');
-	include ('../../codebase/db_pdo.php');
 	include ('../../codebase/scheduler_connector.php');
-	include ('../../codebase/db_sqlsrv.php');
 
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
     
diff --git a/samples/scheduler/05_json_connector.php b/samples/scheduler/05_json_connector.php
index ae36cac..4898b18 100644
--- a/samples/scheduler/05_json_connector.php
+++ b/samples/scheduler/05_json_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	include ('../config.php');
-	include ('../../codebase/db_pdo.php');
 	include ('../../codebase/scheduler_connector.php');
 
     $res= new PDO($mysql_server,$mysql_user,$mysql_pass); 
diff --git a/samples/scheduler/06_json_connector_options.php b/samples/scheduler/06_json_connector_options.php
index 613c6fe..8dba577 100644
--- a/samples/scheduler/06_json_connector_options.php
+++ b/samples/scheduler/06_json_connector_options.php
@@ -1,5 +1,4 @@
 <?php
-	include ('../../codebase/db_pdo.php');
 	include ('../../codebase/scheduler_connector.php');
 	include ('../config.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
diff --git a/samples/scheduler/07_array_connector.php b/samples/scheduler/07_array_connector.php
index dd65e1b..8e929cf 100644
--- a/samples/scheduler/07_array_connector.php
+++ b/samples/scheduler/07_array_connector.php
@@ -7,6 +7,6 @@
     	array("event_id" => 2, "start_date" => "2010-02-16", "end_date" => "2084-06-08", "event_name" => "second part")
     );
 
-	$scheduler = new SchedulerConnector();
+	$scheduler = new SchedulerConnector(null);
 	$scheduler->render_array($data,"event_id","start_date,end_date,event_name");
 ?>
\ No newline at end of file
diff --git a/samples/security/data_csrf.php b/samples/security/data_csrf.php
index 676befc..75077b2 100644
--- a/samples/security/data_csrf.php
+++ b/samples/security/data_csrf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/security/dataview_csrf.php b/samples/security/dataview_csrf.php
index 897a8c1..c4a9cc6 100644
--- a/samples/security/dataview_csrf.php
+++ b/samples/security/dataview_csrf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/security/form_csrf.php b/samples/security/form_csrf.php
index 62ea2f6..e25f2b7 100644
--- a/samples/security/form_csrf.php
+++ b/samples/security/form_csrf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/security/grid_csrf.php b/samples/security/grid_csrf.php
index 1061e45..ddcd534 100644
--- a/samples/security/grid_csrf.php
+++ b/samples/security/grid_csrf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/security/scheduler_csrf.php b/samples/security/scheduler_csrf.php
index ca278ab..6705714 100644
--- a/samples/security/scheduler_csrf.php
+++ b/samples/security/scheduler_csrf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/security/tree_csrf.php b/samples/security/tree_csrf.php
index 013aaba..9287a68 100644
--- a/samples/security/tree_csrf.php
+++ b/samples/security/tree_csrf.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/01_basic_connector.php b/samples/tree/01_basic_connector.php
index 41d3539..a8bcd2d 100644
--- a/samples/tree/01_basic_connector.php
+++ b/samples/tree/01_basic_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/01p_basic_connector.php b/samples/tree/01p_basic_connector.php
index 9179ab3..bdb1d19 100644
--- a/samples/tree/01p_basic_connector.php
+++ b/samples/tree/01p_basic_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/02_dynamic_loading_connector.php b/samples/tree/02_dynamic_loading_connector.php
index 18218d4..fdf55d4 100644
--- a/samples/tree/02_dynamic_loading_connector.php
+++ b/samples/tree/02_dynamic_loading_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/03_sql_config_connector.php b/samples/tree/03_sql_config_connector.php
index 272f4d9..b8b2c0b 100644
--- a/samples/tree/03_sql_config_connector.php
+++ b/samples/tree/03_sql_config_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/04_custom_styles_connector.php b/samples/tree/04_custom_styles_connector.php
index 3dd2835..b2330d2 100644
--- a/samples/tree/04_custom_styles_connector.php
+++ b/samples/tree/04_custom_styles_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/tree/05_save_connector.php b/samples/tree/05_save_connector.php
index 41d3539..a8bcd2d 100644
--- a/samples/tree/05_save_connector.php
+++ b/samples/tree/05_save_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/06_validation_connector.php b/samples/tree/06_validation_connector.php
index c24da86..eeb4c97 100644
--- a/samples/tree/06_validation_connector.php
+++ b/samples/tree/06_validation_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-   require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/08_tree_group_connector.php b/samples/tree/08_tree_group_connector.php
index c12cc07..00584e6 100644
--- a/samples/tree/08_tree_group_connector.php
+++ b/samples/tree/08_tree_group_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/tree/09_tree_multitable_connector.php b/samples/tree/09_tree_multitable_connector.php
index 6a5a557..ad7dc41 100644
--- a/samples/tree/09_tree_multitable_connector.php
+++ b/samples/tree/09_tree_multitable_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/treegrid/01_basic_connector.php b/samples/treegrid/01_basic_connector.php
index edc582a..de478cc 100644
--- a/samples/treegrid/01_basic_connector.php
+++ b/samples/treegrid/01_basic_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/treegrid/02_dynamic_loading_connector.php b/samples/treegrid/02_dynamic_loading_connector.php
index 87065dd..0c0c8ae 100644
--- a/samples/treegrid/02_dynamic_loading_connector.php
+++ b/samples/treegrid/02_dynamic_loading_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/treegrid/03_sql_config_connector.php b/samples/treegrid/03_sql_config_connector.php
index e4944cf..f625a32 100644
--- a/samples/treegrid/03_sql_config_connector.php
+++ b/samples/treegrid/03_sql_config_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/treegrid/04_custom_styles_connector.php b/samples/treegrid/04_custom_styles_connector.php
index 44de104..d36b1e6 100644
--- a/samples/treegrid/04_custom_styles_connector.php
+++ b/samples/treegrid/04_custom_styles_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/treegrid/05_live_update_connector.php b/samples/treegrid/05_live_update_connector.php
index cbda3c5..932b52e 100644
--- a/samples/treegrid/05_live_update_connector.php
+++ b/samples/treegrid/05_live_update_connector.php
@@ -1,6 +1,5 @@
 <?php
 	require_once("../config.php");
-	require("../../codebase/db_pdo.php");
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 
diff --git a/samples/treegrid/06_treegrid_group_connector.php b/samples/treegrid/06_treegrid_group_connector.php
index e08e10d..d6af98b 100644
--- a/samples/treegrid/06_treegrid_group_connector.php
+++ b/samples/treegrid/06_treegrid_group_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);
 	
 	
diff --git a/samples/treegrid/07_treegrid_multitable_connector.php b/samples/treegrid/07_treegrid_multitable_connector.php
index 6dd0d9f..d099f96 100644
--- a/samples/treegrid/07_treegrid_multitable_connector.php
+++ b/samples/treegrid/07_treegrid_multitable_connector.php
@@ -1,7 +1,6 @@
 <?php
 
 	require_once("../config.php");
-	require_once('../../codebase/db_pdo.php');
 	$res= new PDO($mysql_server,$mysql_user,$mysql_pass);