Update

Author: Andrews54757

SuperSQL/SuperSQL.php

@@ -53,7 +53,12 @@ function __construct($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) {
+        if (!$limit && (isset($join['ORDER']) ||
+                        isset($join['!ORDER']) || 
+                        isset($join['GROUP']) || 
+                        isset($join['LIMIT']) || 
+                        isset($join['OFFSET']) || 
+                        is_int($join) || is_string($join) || isset($join[0]))) {
             $limit = $join;
             $join  = null;
         }

SuperSQL/lib/parser.php

@@ -494,7 +494,7 @@ static function SELECT($table, $columns, $where, $join, $limit)
                     if (isset($limit['ORDER'])) {
                         $sql .= ' ORDER BY ' . self::quote($limit['ORDER']);
                     } else if (isset($limit['!ORDER'])) {
-                        $sql .= ' ORDER BY ' . self::quote($limit['ORDER']) . ' DESC';
+                        $sql .= ' ORDER BY ' . self::quote($limit['!ORDER']) . ' DESC';
                     }
                     if (isset($limit['LIMIT'])) {
                         $sql .= ' LIMIT ' . (int) $limit['LIMIT'];

builder.js

@@ -23,7 +23,7 @@ SOFTWARE.
 */
 
 
-var version = "1.1.5";
+var version = "1.1.6";
 
 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.1.5",
+    "version": "1.1.6",
     "type": "framework",
     "keywords": ["SQL", "database", "small", "lightweight", "advanced", "MySQL"],
     "homepage": "https://threeletters.github.io/SuperSQL/",

dist/README.md

@@ -7,37 +7,37 @@
 
 ### Sizes
 
-* `SuperSQL.php` - 28558 Chars (28.6 MB)
-* `SuperSQL_min.php` - 12644 Chars (12.6 MB)
+* `SuperSQL.php` - 28810 Chars (28.8 MB)
+* `SuperSQL_min.php` - 12747 Chars (12.7 MB)
 * `SuperSQL_helper.php` - 11234 Chars (11.2 MB)
 * `SuperSQL_helper_min.php` - 5558 Chars (5.6 MB)
-* `SuperSQL_complete_min.php` - 17922 Chars (17.9 MB)
+* `SuperSQL_complete_min.php` - 18025 Chars (18 MB)
 
 ## Hashes
 
 ```
-* SuperSQL.php - e66095702fc3364ed5b60ab9c58284c2
-* SuperSQL_min.php - 4137ec30163845fb4142ee63363d7ebe
-* SuperSQL_helper.php - adaddf5e3cdf5f612a55b3f13f918bd1
-* SuperSQL_helper_min.php - e4319fa820edaa9ce87b904569424295
-* SuperSQL_complete.php - 13985e2acec0e184772666c5b02feafb
+* SuperSQL.php - ef68d9f5a5223d8dc8a1e5c9710fee2a
+* SuperSQL_min.php - cb59dc4145f4f928ab0420dbf12cf63a
+* SuperSQL_helper.php - c28eb974df4b6b59cfd1703b93ba5ad5
+* SuperSQL_helper_min.php - 434f45d06501865c04386f32874637bf
+* SuperSQL_complete.php - 12d192dc93e6bb86d0bc32caf98f2de1
 ```
 
 ## Performance
 
 Profiled on PHP v7.1.4, 30 loops
 
 
-0.0218ms Average Time, Sum: 0.6541ms
+0.023ms Average Time, Sum: 0.6896ms
 
 ### Specifics
 
 | Name                    |  Avg   |  Sum   |
 |-------------------------|--------|--------|
-| 1 Row Insert            | 0.0013 | 0.0388 |
-| 100 R Insert W Temp     | 0.0162 | 0.4846 |
-| Select *                | 0.0007 | 0.0206 |
-| Select * W Cast         | 0.0006 | 0.0169 |
-| Select * W Cast W where | 0.0007 | 0.0197 |
-| 1 Row Update            | 0.0013 | 0.0401 |
-| Delete                  | 0.001 | 0.0311 |
+| 1 Row Insert            | 0.0013 | 0.038 |
+| 100 R Insert W Temp     | 0.0173 | 0.5191 |
+| Select *                | 0.0007 | 0.02 |
+| Select * W Cast         | 0.0006 | 0.0178 |
+| Select * W Cast W where | 0.0007 | 0.0201 |
+| 1 Row Update            | 0.0014 | 0.0413 |
+| Delete                  | 0.001 | 0.0309 |

dist/SuperSQL.php

@@ -3,8 +3,8 @@
  Author: Andrews54757
  License: MIT (https://github.com/ThreeLetters/SuperSQL/blob/master/LICENSE)
  Source: https://github.com/ThreeLetters/SQL-Library
- Build: v1.1.5
- Built on: 16/04/2018
+ Build: v1.1.6
+ Built on: 23/07/2018
 */
 
 namespace SuperSQL;
@@ -639,7 +639,7 @@ static function SELECT($table, $columns, $where, $join, $limit)
                     if (isset($limit['ORDER'])) {
                         $sql .= ' ORDER BY ' . self::quote($limit['ORDER']);
                     } else if (isset($limit['!ORDER'])) {
-                        $sql .= ' ORDER BY ' . self::quote($limit['ORDER']) . ' DESC';
+                        $sql .= ' ORDER BY ' . self::quote($limit['!ORDER']) . ' DESC';
                     }
                     if (isset($limit['LIMIT'])) {
                         $sql .= ' LIMIT ' . (int) $limit['LIMIT'];
@@ -793,7 +793,12 @@ function __construct($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) {
+        if (!$limit && (isset($join['ORDER']) ||
+                        isset($join['!ORDER']) || 
+                        isset($join['GROUP']) || 
+                        isset($join['LIMIT']) || 
+                        isset($join['OFFSET']) || 
+                        is_int($join) || is_string($join) || isset($join[0]))) {
             $limit = $join;
             $join  = null;
         }

dist/SuperSQL_complete.php

@@ -3,8 +3,8 @@
  Author: Andrews54757
  License: MIT (https://github.com/ThreeLetters/SuperSQL/blob/master/LICENSE)
  Source: https://github.com/ThreeLetters/SQL-Library
- Build: v1.1.5
- Built on: 16/04/2018
+ Build: v1.1.6
+ Built on: 23/07/2018
 */
 
 namespace SuperSQL;

dist/SuperSQL_helper.php

@@ -3,8 +3,8 @@
  Author: Andrews54757
  License: MIT (https://github.com/ThreeLetters/SuperSQL/blob/master/LICENSE)
  Source: https://github.com/ThreeLetters/SQL-Library
- Build: v1.1.5
- Built on: 16/04/2018
+ Build: v1.1.6
+ Built on: 23/07/2018
 */
 
 namespace SuperSQL;