v1.0.8

Author: Andrews54757

SuperSQL/helper.php

@@ -156,14 +156,6 @@ private static function escape($value)
         }
         return $value;
     }
-    private static function escape2($value)
-    {
-        if (is_numeric($value)) {
-            return (int) $value;
-        } else {
-            return '\'' . $value . '\'';
-        }
-    }
     function change($id)
     {
         $this->s = $this->connections[$id];
@@ -227,7 +219,7 @@ function replace($table, $data, $where = array())
         foreach ($data as $key => $val) {
             $str = '`' . Parser::rmComments($key) . '`';
             foreach ($val as $k => $v) {
-                $str = 'REPLACE(' . $str . ', ' . self::escape2($k) . ', ' . self::escape($v) . ')';
+                $str = 'REPLACE(' . $str . ', ' . Parser::escape($k) . ', ' . self::escape($v) . ')';
             }
             $newData['#' . $key] = $str;
         }

builder.js

@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 
-var version = "1.0.7";
+var version = "1.0.8";
 
 var today = new Date();
 var dd = today.getDate();

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "threeletters/supersql",
     "description": "SlickInject and Medoo on steroids - The most advanced and lightweight library of its kind.",
-    "version": "1.0.7",
+    "version": "1.0.8",
     "type": "framework",
     "keywords": ["SQL", "database", "small", "lightweight", "advanced", "MySQL"],
     "homepage": "https://threeletters.github.io/SuperSQL/",

dist/README.md

@@ -7,16 +7,16 @@
 
 ### Sizes
 
-* `SuperSQL.php` - 29987 Chars (30 MB)
-* `SuperSQL_min.php` - 13506 Chars (13.5 MB)
-* `SuperSQL_helper.php` - 10010 Chars (10 MB)
-* `SuperSQL_helper_min.php` - 4932 Chars (4.9 MB)
+* `SuperSQL.php` - 28262 Chars (28.3 MB)
+* `SuperSQL_min.php` - 12471 Chars (12.5 MB)
+* `SuperSQL_helper.php` - 9820 Chars (9.8 MB)
+* `SuperSQL_helper_min.php` - 4836 Chars (4.8 MB)
 
 ## Hashes
 
 ```
-* SuperSQL.php - 08119eb3f27e06ea88626385278c4f06
-* SuperSQL_min.php - 2657d6903a1d9a20ba00a24d8a328fcd
-* SuperSQL_helper.php - f426f7eeaa1fc0bf55b04d729191ef41
-* SuperSQL_helper_min.php - 80499ad5594c0157e7a0cffe1182de76
+* SuperSQL.php - 39136f701548e1a3be34e8a206dfeb5f
+* SuperSQL_min.php - 5cac895d3eecd0a869de3beb8f02bf97
+* SuperSQL_helper.php - 505973eecd9f31fbb912c568559afdbf
+* SuperSQL_helper_min.php - f4d3697859e4aa1bf744ebf8b6165895
 ```

dist/SuperSQL.php

@@ -854,67 +854,5 @@ static function DELETE($table, $where)
 }
 
 // index.php
-class SuperSQL
-{
-    public $con;
-    public $lockMode = false;
-    function __construct($dsn, $user, $pass)
-    {
-        $this->con = new Connector($dsn, $user, $pass);
-    }
-    function SELECT($table, $columns = array(), $where = array(), $join = null, $limit = false)
-    {
-        if ((is_int($join) || is_string($join) || isset($join[0])) && !$limit) {
-            $limit = $join;
-            $join  = null;
-        }
-        $d = Parser::SELECT($table, $columns, $where, $join, $limit);
-        return $this->con->_query($d[0], $d[1], $d[2], $d[3], $this->lockMode ? 0 : 1);
-    }
-    function INSERT($table, $data)
-    {
-        $d = Parser::INSERT($table, $data);
-        return $this->con->_query($d[0], $d[1], $d[2]);
-    }
-    function UPDATE($table, $data, $where = array())
-    {
-        $d = Parser::UPDATE($table, $data, $where);
-        return $this->con->_query($d[0], $d[1], $d[2]);
-    }
-    function DELETE($table, $where = array())
-    {
-        $d = Parser::DELETE($table, $where);
-        return $this->con->_query($d[0], $d[1], $d[2]);
-    }
-    function query($query, $obj = null, $outtypes = null, $mode = 0)
-    {
-        return $this->con->query($query, $obj, $outtypes, $mode);
-    }
-    function close()
-    {
-        $this->con->close();
-    }
-    function dev()
-    {
-        $this->con->dev = true;
-    }
-    function getLog()
-    {
-        return $this->con->log;
-    }
-    function transact($func)
-    {
-        $this->con->db->beginTransaction();
-        $r = $func($this);
-        if ($r === false)
-            $this->con->db->rollBack();
-        else
-            $this->con->db->commit();
-        return $r;
-    }
-    function modeLock($val)
-    {
-        $this->lockMode = $val;
-    }
-}
+?>
 ?>

dist/SuperSQL_helper.php

@@ -125,14 +125,6 @@ private static function escape($value)
         }
         return $value;
     }
-    private static function escape2($value)
-    {
-        if (is_numeric($value)) {
-            return (int) $value;
-        } else {
-            return '\'' . $value . '\'';
-        }
-    }
     function change($id)
     {
         $this->s = $this->connections[$id];
@@ -175,7 +167,7 @@ function replace($table, $data, $where = array())
         foreach ($data as $key => $val) {
             $str = '`' . Parser::rmComments($key) . '`';
             foreach ($val as $k => $v) {
-                $str = 'REPLACE(' . $str . ', ' . self::escape2($k) . ', ' . self::escape($v) . ')';
+                $str = 'REPLACE(' . $str . ', ' . Parser::escape($k) . ', ' . self::escape($v) . ')';
             }
             $newData['#' . $key] = $str;
         }

dist/SuperSQL_helper_min.php

@@ -9,5 +9,5 @@
 
 namespace SuperSQL;
 
-class SQLHelper{public$s;public$connections;function __construct($a,$b=null,$c=null,$d=null,$e=array()){$this->connections=array();if(is_array($a)){if(is_array($a[0])){foreach($a as$f=>$g){$h=isset($g['host'])?$g['host']: '';$b=isset($g['db'])?$g['db']: '';$c=isset($g['user'])?$g['user']: '';$d=isset($g['password'])?$g['password']: '';$i=isset($g['options'])?$g['options']: array();$j=self::connect($h,$b,$c,$d,$i);array_push($this->connections,$j);}}else{foreach($a as$f=>$g){array_push($this->connections,$g);}}$this->s=$this->connections[0];}else if(is_string($a)){$this->s=self::connect($a,$b,$c,$d,$e);array_push($this->connections,$this->s);}else{array_push($this->connections,$a);$this->s=$a;}}static function connect($h,$b,$c,$d,$e=array()){$k='mysql';$l=false;if(is_string($e)){if(strpos($e,':')!==false){$l=$e;}else{$k=strtolower($e);}}else if(isset($e['dbtype']))$k=strtolower($e['dbtype']);if(!$l){$m='';switch($k){case 'pgsql':$m='pgsql';$n=array('dbname'=>$b,'host'=>$h);if(isset($e['port']))$n['port']=$e['port'];break;case 'sybase':$m='dblib';$n=array('dbname'=>$b,'host'=>$h);if(isset($e['port']))$n['port']=$e['port'];break;case 'oracle':$m='oci';$n=array('dbname'=>isset($h)? '//'.$h.':'.(isset($e['port'])?$e['port']: '1521').'/'.$b :$b);break;default:$m='mysql';$n=array('dbname'=>$b);if(isset($e['socket']))$n['unix_socket']=$e['socket'];else{$n['host']=$h;if(isset($e['port']))$n['port']=$e['port'];}break;}$l=$m.':';if(isset($e['charset'])){$n['charset']=$e['charset'];}$l=$m.':';$o=0;foreach($n as$f=>$p){if($o!=0){$l.=';';}$l.=$f.'='.$p;$o++;}}return new SuperSQL($l,$c,$d);}private static function escape($q){$r=strtolower(gettype($q));if($r=='boolean'){$q=$q ? '1' : '0';}else if($r=='string'){$q='\''.$q.'\'';}else if($r=='double'||$r=='integer'){$q=(int)$q;}else if($r=='null'){$q='0';}return$q;}private static function escape2($q){if(is_numeric($q)){return(int)$q;}else{return '\''.$q.'\'';}}function change($s){$this->s=$this->connections[$s];return$this->s;}function getCon($t=false){if($t){return$this->connections;}else{return$this->s;}}function get($u,$v=array(),$w=array(),$x=null){$y=$this->s->SELECT($u,$v,$w,$x,1)->getData();return($y&&$y[0])?$y[0]: false;}function create($u,$n){$z='CREATE TABLE `'.$u.'` (';$aa=0;foreach($n as$f=>$p){if($aa!=0){$z.=', ';}$z.='`'.$f.'` '.$p;$aa++;}$z.=')';return$this->s->query($z);}function drop($u){return$this->s->query('DROP TABLE `'.$u.'`');}function replace($u,$n,$w=array()){$ba=array();foreach($n as$f=>$p){$ca='`'.Parser::rmComments($f).'`';foreach($p as$da=>$g){$ca='REPLACE('.$ca.', '.self::escape2($da).', '.self::escape($g).')';}$ba['#'.$f]=$ca;}return$this->s->UPDATE($u,$ba,$w);}function select($u,$v=array(),$w=array(),$x=null,$ea=false){return$this->s->SELECT($u,$v,$w,$x,$ea);}function insert($u,$n){return$this->s->INSERT($u,$n);}function update($u,$n,$w=array()){return$this->s->UPDATE($u,$n,$w);}function delete($u,$w=array()){return$this->s->DELETE($u,$w);}function sqBase($z,$w,$x){$aa=0;$fa=array();if($x){Parser::JOIN($x,$z,$fa,$aa);}if(count($w)!=0){$z.=' WHERE ';$z.=Parser::conditions($w,$fa);}$ga=$this->_query($z,$fa);return$ga[0]->fetchColumn();}function count($u,$w=array(),$x=array()){return$this->sqBase('SELECT COUNT(*) FROM `'.$u.'`',$w,$x);}function avg(){return$this->sqBase('SELECT AVG(`'.$column.'`) FROM `'.$u.'`',$w,$x);}function max($u,$ha,$w=array(),$x=array()){return$this->sqBase('SELECT MAX(`'.$ha.'`) FROM `'.$u.'`',$w,$x);}function min($u,$ha,$w=array(),$x=array()){return$this->sqBase('SELECT MIN(`'.$ha.'`) FROM `'.$u.'`',$w,$x);}function sum($u,$ha,$w=array(),$x=array()){return$this->sqBase('SELECT SUM(`'.$ha.'`) FROM `'.$u.'`',$w,$x);}function _query($z,$ia){$ja=$this->s->con->db->prepare($z);foreach($ia as$f=>&$ka){$ja->bindParam($f+1,$ka[0],$ka[1]);}$la=$ja->execute();return array($ja,$la);}function query($ma,$o=null){return$this->s->con->query($ma,$o);}function transact($na){return$this->s->transact($na);}function selectMap($u,$oa,$w=array(),$x=null,$ea=false){$v=array();$pa=array();function recurse($n,&$qa,&$v,&$pa){foreach($n as$f=>$p){if(is_int($f)){array_push($v,$p);$ra=Parser::getType($p);if($ra){$j=Parser::getType($p);if($j&&($j==="int"||$j==="bool"||$j==="string"||$j==="json"||$j==="obj")){$ra=false;}}if($ra){array_push($qa,$ra);}else{preg_match('/(?:[^\.]*\.)?(.*)/',$p,$sa);array_push($qa,$sa[1]);}}else{$qa[$f]=array();recurse($p,$qa[$f],$v,$pa);}}}recurse($oa,$pa,$v,$pa);$ta=$this->s->select($u,$v,$w,$x,$ea);$y=$ta->getData();function recurse2($n,$ua,&$va){$va=array();foreach($n as$f=>$p){if(is_int($f)){$va[$p]=$ua[$p];}else{recurse2($p,$ua,$va[$f]);}}}$ta->result=array();foreach($y as$aa=>$ua){recurse2($pa,$ua,$ta->result[$aa]);}return$ta;}}
+class SQLHelper{public$s;public$connections;function __construct($a,$b=null,$c=null,$d=null,$e=array()){$this->connections=array();if(is_array($a)){if(is_array($a[0])){foreach($a as$f=>$g){$h=isset($g['host'])?$g['host']: '';$b=isset($g['db'])?$g['db']: '';$c=isset($g['user'])?$g['user']: '';$d=isset($g['password'])?$g['password']: '';$i=isset($g['options'])?$g['options']: array();$j=self::connect($h,$b,$c,$d,$i);array_push($this->connections,$j);}}else{foreach($a as$f=>$g){array_push($this->connections,$g);}}$this->s=$this->connections[0];}else if(is_string($a)){$this->s=self::connect($a,$b,$c,$d,$e);array_push($this->connections,$this->s);}else{array_push($this->connections,$a);$this->s=$a;}}static function connect($h,$b,$c,$d,$e=array()){$k='mysql';$l=false;if(is_string($e)){if(strpos($e,':')!==false){$l=$e;}else{$k=strtolower($e);}}else if(isset($e['dbtype']))$k=strtolower($e['dbtype']);if(!$l){$m='';switch($k){case 'pgsql':$m='pgsql';$n=array('dbname'=>$b,'host'=>$h);if(isset($e['port']))$n['port']=$e['port'];break;case 'sybase':$m='dblib';$n=array('dbname'=>$b,'host'=>$h);if(isset($e['port']))$n['port']=$e['port'];break;case 'oracle':$m='oci';$n=array('dbname'=>isset($h)? '//'.$h.':'.(isset($e['port'])?$e['port']: '1521').'/'.$b :$b);break;default:$m='mysql';$n=array('dbname'=>$b);if(isset($e['socket']))$n['unix_socket']=$e['socket'];else{$n['host']=$h;if(isset($e['port']))$n['port']=$e['port'];}break;}$l=$m.':';if(isset($e['charset'])){$n['charset']=$e['charset'];}$l=$m.':';$o=0;foreach($n as$f=>$p){if($o!=0){$l.=';';}$l.=$f.'='.$p;$o++;}}return new SuperSQL($l,$c,$d);}private static function escape($q){$r=strtolower(gettype($q));if($r=='boolean'){$q=$q ? '1' : '0';}else if($r=='string'){$q='\''.$q.'\'';}else if($r=='double'||$r=='integer'){$q=(int)$q;}else if($r=='null'){$q='0';}return$q;}function change($s){$this->s=$this->connections[$s];return$this->s;}function getCon($t=false){if($t){return$this->connections;}else{return$this->s;}}function get($u,$v=array(),$w=array(),$x=null){$y=$this->s->SELECT($u,$v,$w,$x,1)->getData();return($y&&$y[0])?$y[0]: false;}function create($u,$n){$z='CREATE TABLE `'.$u.'` (';$aa=0;foreach($n as$f=>$p){if($aa!=0){$z.=', ';}$z.='`'.$f.'` '.$p;$aa++;}$z.=')';return$this->s->query($z);}function drop($u){return$this->s->query('DROP TABLE `'.$u.'`');}function replace($u,$n,$w=array()){$ba=array();foreach($n as$f=>$p){$ca='`'.Parser::rmComments($f).'`';foreach($p as$da=>$g){$ca='REPLACE('.$ca.', '.Parser::escape($da).', '.self::escape($g).')';}$ba['#'.$f]=$ca;}return$this->s->UPDATE($u,$ba,$w);}function select($u,$v=array(),$w=array(),$x=null,$ea=false){return$this->s->SELECT($u,$v,$w,$x,$ea);}function insert($u,$n){return$this->s->INSERT($u,$n);}function update($u,$n,$w=array()){return$this->s->UPDATE($u,$n,$w);}function delete($u,$w=array()){return$this->s->DELETE($u,$w);}function sqBase($z,$w,$x){$aa=0;$fa=array();if($x){Parser::JOIN($x,$z,$fa,$aa);}if(count($w)!=0){$z.=' WHERE ';$z.=Parser::conditions($w,$fa);}$ga=$this->_query($z,$fa);return$ga[0]->fetchColumn();}function count($u,$w=array(),$x=array()){return$this->sqBase('SELECT COUNT(*) FROM `'.$u.'`',$w,$x);}function avg(){return$this->sqBase('SELECT AVG(`'.$column.'`) FROM `'.$u.'`',$w,$x);}function max($u,$ha,$w=array(),$x=array()){return$this->sqBase('SELECT MAX(`'.$ha.'`) FROM `'.$u.'`',$w,$x);}function min($u,$ha,$w=array(),$x=array()){return$this->sqBase('SELECT MIN(`'.$ha.'`) FROM `'.$u.'`',$w,$x);}function sum($u,$ha,$w=array(),$x=array()){return$this->sqBase('SELECT SUM(`'.$ha.'`) FROM `'.$u.'`',$w,$x);}function _query($z,$ia){$ja=$this->s->con->db->prepare($z);foreach($ia as$f=>&$ka){$ja->bindParam($f+1,$ka[0],$ka[1]);}$la=$ja->execute();return array($ja,$la);}function query($ma,$o=null){return$this->s->con->query($ma,$o);}function transact($na){return$this->s->transact($na);}function selectMap($u,$oa,$w=array(),$x=null,$ea=false){$v=array();$pa=array();function recurse($n,&$qa,&$v,&$pa){foreach($n as$f=>$p){if(is_int($f)){array_push($v,$p);$ra=Parser::getType($p);if($ra){$j=Parser::getType($p);if($j&&($j==="int"||$j==="bool"||$j==="string"||$j==="json"||$j==="obj")){$ra=false;}}if($ra){array_push($qa,$ra);}else{preg_match('/(?:[^\.]*\.)?(.*)/',$p,$sa);array_push($qa,$sa[1]);}}else{$qa[$f]=array();recurse($p,$qa[$f],$v,$pa);}}}recurse($oa,$pa,$v,$pa);$ta=$this->s->select($u,$v,$w,$x,$ea);$y=$ta->getData();function recurse2($n,$ua,&$va){$va=array();foreach($n as$f=>$p){if(is_int($f)){$va[$p]=$ua[$p];}else{recurse2($p,$ua,$va[$f]);}}}$ta->result=array();foreach($y as$aa=>$ua){recurse2($pa,$ua,$ta->result[$aa]);}return$ta;}}
 ?>