Commit 606cb84

committed

Merge pull request #49 from cfilippe/strengthen-transactions

Strengthen transactions

2 parents 0531717 + fa9f5ce commit 606cb84Copy full SHA for 606cb84

File tree

1 file changed

+39

-17

lines changed

class.MySQL.php

1 file changed

+39

-17

lines changed

`‎class.MySQL.php`

Lines changed: 39 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,37 +23,43 @@`
`23`	`23`	`class MySQL {`
`24`	`24`
`25`	`25`	`// Base variables`
`26`		`- var $lastError; // Holds the last error`
`27`		`- var $lastQuery; // Holds the last query`
`28`		`- var $result; // Holds the MySQL query result`
`29`		`- var $records; // Holds the total number of records returned`
`30`		`- var $affected; // Holds the total number of records affected`
`31`		`- var $rawResults; // Holds raw 'arrayed' results`
`32`		`- var $arrayedResult; // Holds an array of the result`
	`26`	`+ public $lastError; // Holds the last error`
	`27`	`+ public $lastQuery; // Holds the last query`
	`28`	`+ public $result; // Holds the MySQL query result`
	`29`	`+ public $records; // Holds the total number of records returned`
	`30`	`+ public $affected; // Holds the total number of records affected`
	`31`	`+ public $rawResults; // Holds raw 'arrayed' results`
	`32`	`+ public $arrayedResult; // Holds an array of the result`
`33`	`33`
`34`		`- var $hostname; // MySQL Hostname`
`35`		`- var $username; // MySQL Username`
`36`		`- var $password; // MySQL Password`
`37`		`- var $database; // MySQL Database`
	`34`	`+ private $hostname; // MySQL Hostname`
	`35`	`+ private $username; // MySQL Username`
	`36`	`+ private $password; // MySQL Password`
	`37`	`+ private $database; // MySQL Database`
`38`	`38`
`39`		`- var $databaseLink; // Database Connection Link`
	`39`	`+ private $databaseLink; // Database Connection Link`
`40`	`40`
`41`	`41`
`42`	`42`
`43`	`43`	`/* *******************`
`44`	`44`	`* Class Constructor *`
`45`	`45`	`* *******************/`
`46`	`46`
`47`		`- function __construct($database, $username, $password, $hostname='localhost', $port=3306){`
	`47`	`+ function __construct($database, $username, $password, $hostname='localhost', $port=3306, $persistant = false){`
`48`	`48`	`$this->database = $database;`
`49`	`49`	`$this->username = $username;`
`50`	`50`	`$this->password = $password;`
`51`	`51`	`$this->hostname = $hostname.':'.$port;`
`52`	`52`
`53`		`- $this->Connect();`
	`53`	`+ $this->Connect($persistant);`
`54`	`54`	`}`
`55`	`55`
	`56`	`+ /* *******************`
	`57`	`+ * Class Destructor *`
	`58`	`+ * *******************/`
`56`	`59`
	`60`	`+ function __destruct(){`
	`61`	`+ $this->closeConnection();`
	`62`	`+ }`
`57`	`63`
`58`	`64`	`/* *******************`
`59`	`65`	`* Private Functions *`
`@@ -79,6 +85,8 @@ private function Connect($persistant = false){`
`79`	`85`	`$this->lastError = 'Could not connect to database: ' . mysql_error($this->databaseLink);`
`80`	`86`	`return false;`
`81`	`87`	`}`
	`88`	`+`
	`89`	`+ $this->setCharset(); // TODO: remove forced charset find out a specific management`
`82`	`90`	`return true;`
`83`	`91`	`}`
`84`	`92`
`@@ -118,7 +126,8 @@ private function SecureData($data, $types){`
`118`	`126`	`private function CleanData($data, $type = ''){`
`119`	`127`	`switch($type) {`
`120`	`128`	`case 'none':`
`121`		`- $data = $data;`
	`129`	`+ // useless do not reaffect just do nothing`
	`130`	`+ //$data = $data;`
`122`	`131`	`break;`
`123`	`132`	`case 'str':`
`124`	`133`	`$data = settype( $data, 'string');`
`@@ -191,7 +200,18 @@ public function executeSQL($query){`
`191`	`200`	`}`
`192`	`201`	`}`
`193`	`202`
	`203`	`+ public function commit(){`
	`204`	`+ return mysql_query("COMMIT", $this->databaseLink);`
	`205`	`+ }`
	`206`	`+`
	`207`	`+ public function rollback(){`
	`208`	`+ return mysql_query("ROLLBACK", $this->databaseLink);`
	`209`	`+ }`
`194`	`210`
	`211`	`+ public function setCharset( $charset = 'UTF8' ) {`
	`212`	`+ return mysql_set_charset ( $this->SecureData($charset,'string'), $this->databaseLink);`
	`213`	`+ }`
	`214`	`+`
`195`	`215`	`// Adds a record to the database based on the array key names`
`196`	`216`	`public function insert($table, $vars, $exclude = '', $datatypes){`
`197`	`217`
`@@ -360,7 +380,7 @@ public function arrayResultsWithKey($key='id'){`
`360`	`380`
`361`	`381`	`// Returns last insert ID`
`362`	`382`	`public function lastInsertID(){`
`363`		`- return mysql_insert_id();`
	`383`	`+ return mysql_insert_id($this->databaseLink);`
`364`	`384`	`}`
`365`	`385`
`366`	`386`	`// Return number of rows`
`@@ -372,7 +392,9 @@ public function countRows($from, $where=''){`
`372`	`392`	`// Closes the connections`
`373`	`393`	`public function closeConnection(){`
`374`	`394`	`if($this->databaseLink){`
	`395`	`+ // Commit before closing just in case :)`
	`396`	`+ $this->commit();`
`375`	`397`	`mysql_close($this->databaseLink);`
`376`	`398`	`}`
`377`	`399`	`}`
`378`		`-}`
	`400`	`+}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 606cb84

File tree

1 file changed

1 file changed

`‎class.MySQL.php`

0 commit comments