tspace-mysql 1.4.4 → 1.4.6

package/dist/lib/tspace/Builder.js

@@ -74,26 +74,24 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     }
     /**
      *
-     * @param {string=} column [column=id]
      * @return {this} this
      */
-    distinct(column = 'id') {
-        this.$state.set('SELECT', [
-            `${this.$constants('SELECT')}`,
-            `${this.$constants('DISTINCT')}`,
-            `${column}`
-        ].join(' '));
+    distinct() {
+        this.$state.set('DISTINCT', true);
+        const select = this.$state.get('SELECT');
+        if (select.includes('*'))
+            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('DISTINCT')} *`);
         return this;
     }
     /**
      * select data form table
-     * @param {Array<string>} ...columns
+     * @param {string[]} ...columns
      * @return {this} this
      */
     select(...columns) {
         if (!columns.length)
             return this;
-        const select = columns.map((column) => {
+        let select = columns.map((column) => {
             if (column === '*')
                 return column;
             if (/\./.test(column))
@@ -102,19 +100,25 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 return column === null || column === void 0 ? void 0 : column.replace(this.$constants('RAW'), '').replace(/'/g, '');
             return `\`${column}\``;
         }).join(', ');
+        select = this.$state.get('DISTINCT') && !select.includes(this.$constants('DISTINCT'))
+            ? `${this.$constants('DISTINCT')} ${select}`
+            : `${select}`;
         this.$state.set('SELECT', `${this.$constants('SELECT')} ${select}`);
         return this;
     }
     selectRaw(...columns) {
         if (!columns.length)
             return this;
-        const select = columns.map((column) => {
+        let select = columns.map((column) => {
             if (column === '*')
                 return column;
             if (column.includes(this.$constants('RAW')))
                 return column === null || column === void 0 ? void 0 : column.replace(this.$constants('RAW'), '').replace(/'/g, '');
             return column;
         }).join(', ');
+        select = this.$state.get('DISTINCT') && !select.includes(this.$constants('DISTINCT'))
+            ? `${this.$constants('DISTINCT')} ${select}`
+            : `${select}`;
         this.$state.set('SELECT', `${this.$constants('SELECT')} ${select}`);
         return this;
     }
@@ -186,14 +190,15 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     }
     /**
      * where json target to key in json values default operator '='
+     * @param    {string} column
      * @param    {object}  property
-     * @property {string}  property.column
      * @property {string}  property.targetKey
      * @property {string}  property.value
      * @property {string?} property.operator
+     * @example
      * @return   {this}
      */
-    whereJson({ column, targetKey, value, operator }) {
+    whereJSON(column, { targetKey, value, operator }) {
         value = this.$utils.escape(value);
         value = this._valueTrueFalse(value);
         this.$state.set('WHERE', [
@@ -201,7 +206,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
                 : `${this.$constants('WHERE')}`,
             `${this._bindTableAndColumnInQueryWhere(column)}->>'$.${targetKey}'`,
-            `${operator == null ? '=' : operator}`,
+            `${operator == null ? "=" : operator.toLocaleUpperCase()}`,
             `${this._checkValueHasRaw(value)}`
         ].join(' '));
         return this;
@@ -671,7 +676,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('AND')}`
                 : `${this.$constants('WHERE')}`,
-            `BINARY ${this._bindTableAndColumnInQueryWhere(column)}`,
+            `${this.$constants('BINARY')} ${this._bindTableAndColumnInQueryWhere(column)}`,
             `${operator}`,
             `${this._checkValueHasRaw(this.$utils.escape(value))}`
         ].join(' '));
@@ -702,7 +707,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             this._queryWhereIsExists()
                 ? `${this.$state.get('WHERE')} ${this.$constants('OR')}`
                 : `${this.$constants('WHERE')}`,
-            `BINARY ${this._bindTableAndColumnInQueryWhere(column)}`,
+            `${this.$constants('BINARY')} ${this._bindTableAndColumnInQueryWhere(column)}`,
             `${operator}`,
             `${this._checkValueHasRaw(this.$utils.escape(value))}`
         ].join(' '));
@@ -802,8 +807,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     }
     /**
      *
-     * @param {string} pk talbe.pk
-     * @param {string} fk talbe.fk
+     * @param {string} localKey local key in current table
+     * @param {string} referenceKey reference key in next table
      * @example
      * await new DB('users')
      * .select('users.id as userId','posts.id as postId','email')
@@ -814,89 +819,89 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * .get()
      * @return {this}
      */
-    join(pk, fk) {
+    join(localKey, referenceKey) {
         var _a;
-        const table = (_a = fk.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
+        const table = (_a = referenceKey.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
         if (this.$state.get('JOIN')) {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('INNER_JOIN')}`,
-                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('INNER_JOIN')}`,
-            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
         ].join(' '));
         return this;
     }
     /**
      *
-     * @param {string} pk talbe.pk
-     * @param {string} fk talbe.fk
+     * @param {string} localKey local key in current table
+     * @param {string} referenceKey reference key in next table
      * @return {this}
      */
-    rightJoin(pk, fk) {
+    rightJoin(localKey, referenceKey) {
         var _a;
-        const table = (_a = fk.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
+        const table = (_a = referenceKey.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
         if (this.$state.get('JOIN')) {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('RIGHT_JOIN')}`,
-                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('RIGHT_JOIN')}`,
-            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
         ].join(' '));
         return this;
     }
     /**
      *
-     * @param {string} pk talbe.pk
-     * @param {string} fk talbe.fk
+     * @param {string} localKey local key in current table
+     * @param {string} referenceKey reference key in next table
      * @return {this}
      */
-    leftJoin(pk, fk) {
+    leftJoin(localKey, referenceKey) {
         var _a;
-        const table = (_a = fk.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
+        const table = (_a = referenceKey.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
         if (this.$state.get('JOIN')) {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('LEFT_JOIN')}`,
-                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('LEFT_JOIN')}`,
-            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
         ].join(' '));
         return this;
     }
     /**
      *
-     * @param {string} pk talbe.pk
-     * @param {string} fk talbe.fk
+     * @param {string} localKey local key in current table
+     * @param {string} referenceKey reference key in next table
      * @return {this}
      */
-    crossJoin(pk, fk) {
+    crossJoin(localKey, referenceKey) {
         var _a;
-        const table = (_a = fk.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
+        const table = (_a = referenceKey.split('.')) === null || _a === void 0 ? void 0 : _a.shift();
         if (this.$state.get('JOIN')) {
             this.$state.set('JOIN', [
                 `${this.$state.get('JOIN')}`,
                 `${this.$constants('CROSS_JOIN')}`,
-                `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+                `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
             ].join(' '));
             return this;
         }
         this.$state.set('JOIN', [
             `${this.$constants('CROSS_JOIN')}`,
-            `\`${table}\` ${this.$constants('ON')} ${pk} = ${fk}`
+            `\`${table}\` ${this.$constants('ON')} ${localKey} = ${referenceKey}`
         ].join(' '));
         return this;
     }
@@ -1143,9 +1148,45 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      *
      * update data in the database
      * @param {object} data
+     * @param {array?} updateNotExists options for except update some records in your ${data} using name column(s)
      * @return {this} this
      */
-    update(data) {
+    update(data, updateNotExists = []) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
+        if (updateNotExists.length) {
+            for (const c of updateNotExists) {
+                for (const column in data) {
+                    if (c !== column)
+                        continue;
+                    const value = data[column];
+                    data[column] = this._updateHandler(column, value);
+                    break;
+                }
+            }
+        }
+        const query = this._queryUpdate(data);
+        this.$state.set('UPDATE', [
+            `${this.$constants('UPDATE')}`,
+            `${this.$state.get('TABLE_NAME')}`,
+            `${query}`
+        ].join(' '));
+        this.$state.set('SAVE', 'UPDATE');
+        return this;
+    }
+    /**
+     *
+     * update record if data is empty in the database
+     * @param {object} data
+     * @return {this} this
+     */
+    updateNotExists(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
+        for (const column in data) {
+            const value = data[column];
+            data[column] = this._updateHandler(column, value);
+        }
         const query = this._queryUpdate(data);
         this.$state.set('UPDATE', [
             `${this.$constants('UPDATE')}`,
@@ -1162,6 +1203,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this
      */
     insert(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const query = this._queryInsert(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1178,6 +1221,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this
      */
     create(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const query = this._queryInsert(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1194,6 +1239,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this this
      */
     createMultiple(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const query = this._queryInsertMultiple(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1210,6 +1257,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {this} this this
      */
     insertMultiple(data) {
+        if (!Object.keys(data).length)
+            throw new Error('This method must be required');
         const query = this._queryInsertMultiple(data);
         this.$state.set('INSERT', [
             `${this.$constants('INSERT')}`,
@@ -1224,14 +1273,24 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {string} return sql query
      */
     toString() {
-        return this._buildQuery();
+        const sql = this._buildQueryStatement();
+        if (this.$state.get('DEBUG'))
+            this.$utils.consoleDebug(sql);
+        return this.resultHandler(sql);
     }
     /**
      *
      * @return {string} return sql query
      */
     toSQL() {
-        return this._buildQuery();
+        return this.toString();
+    }
+    /**
+     *
+     * @return {string}
+    */
+    toRawSQL() {
+        return this.toString();
     }
     /**
      *
@@ -1479,6 +1538,66 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             return removeExcepts.flat();
         });
     }
+    /**
+     * handler query update for except some columns
+     * @param  {string} column
+     * @param {string} value
+     * @return {string} string
+     */
+    _updateHandler(column, value) {
+        return DB_1.DB.raw([
+            this.$constants('CASE'),
+            this.$constants('WHEN'),
+            `(\`${column}\` = "" ${this.$constants('OR')} \`${column}\` ${this.$constants('IS_NULL')})`,
+            this.$constants('THEN'),
+            `"${value !== null && value !== void 0 ? value : ""}" ${this.$constants('ELSE')} \`${column}\``,
+            this.$constants('END')
+        ].join(' '));
+    }
+    /**
+     *
+     * generate sql statements
+     * @return {string} string generated query string
+     */
+    _buildQueryStatement() {
+        let sql = [];
+        while (true) {
+            if (this.$state.get('INSERT')) {
+                sql = [
+                    this.$state.get('INSERT')
+                ];
+                break;
+            }
+            if (this.$state.get('UPDATE')) {
+                sql = [
+                    this.$state.get('UPDATE'),
+                    this.$state.get('WHERE')
+                ];
+                break;
+            }
+            if (this.$state.get('DELETE')) {
+                sql = [
+                    this.$state.get('DELETE'),
+                    this.$state.get('WHERE')
+                ];
+                break;
+            }
+            sql = [
+                this.$state.get('SELECT'),
+                this.$state.get('FROM'),
+                this.$state.get('TABLE_NAME'),
+                this.$state.get('JOIN'),
+                this.$state.get('WHERE'),
+                this.$state.get('GROUP_BY'),
+                this.$state.get('HAVING'),
+                this.$state.get('ORDER_BY'),
+                this.$state.get('LIMIT'),
+                this.$state.get('OFFSET')
+            ];
+            break;
+        }
+        return sql.filter(s => s !== '' || s == null).join(' ');
+    }
     /**
      * execute sql statements with raw sql query
      * @param {string} sql sql execute return data
@@ -1578,7 +1697,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             const nextPage = currentPage + 1;
             const prevPage = currentPage - 1 === 0 ? 1 : currentPage - 1;
             const offset = (page - 1) * limit;
-            let sql = this._buildQuery();
+            let sql = this._buildQueryStatement();
             if (!sql.includes(this.$constants('LIMIT'))) {
                 sql = [
                     `${sql}`,
@@ -1666,7 +1785,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
             this.limit(1);
-            let sql = this._buildQuery();
+            let sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
             if ((_b = this.$state.get('HIDDEN')) === null || _b === void 0 ? void 0 : _b.length)
                 this._hiddenColumn(result);
@@ -1687,7 +1806,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     }
     /**
      *
-     * execute data return object | throw rror
+     * execute data return object | null
      * @return {promise<object | null>}
      */
     findOne() {
@@ -1705,7 +1824,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
         return __awaiter(this, void 0, void 0, function* () {
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
-            let sql = this._buildQuery();
+            let sql = this._buildQueryStatement();
             if (!sql.includes(this.$constants('LIMIT')))
                 sql = `${sql} ${this.$constants('LIMIT')} 1`;
             else
@@ -1752,14 +1871,14 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     /**
      *
      * execute data return Array
-     * @return {promise<Array<any>>}
+     * @return {promise<any[]>}
      */
     get() {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
                 this.select(...yield this.exceptColumns());
-            const sql = this._buildQuery();
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
             if ((_b = this.$state.get('HIDDEN')) === null || _b === void 0 ? void 0 : _b.length)
                 this._hiddenColumn(result);
@@ -1790,7 +1909,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     /**
      *
      * execute data return Array
-     * @return {promise<Array<any>>}
+     * @return {promise<any[]>}
      */
     findMany() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -1803,13 +1922,10 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      * @return {promise<string>}
      */
     toJSON() {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            if ((_a = this.$state.get('EXCEPTS')) === null || _a === void 0 ? void 0 : _a.length)
-                this.select(...yield this.exceptColumns());
-            const sql = this._buildQuery();
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
-            if ((_b = this.$state.get('HIDDEN')) === null || _b === void 0 ? void 0 : _b.length)
+            if (this.$state.get('HIDDEN').length)
                 this._hiddenColumn(result);
             return this.resultHandler(JSON.stringify(result));
         });
@@ -1822,8 +1938,8 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
      */
     toArray(column = 'id') {
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${column}`);
-            const sql = this._buildQuery();
+            this.selectRaw(column);
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
             const toArray = result.map((data) => data[column]);
             return this.resultHandler(toArray);
@@ -1831,42 +1947,38 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     }
     /**
      *
-     * execute data return number of results
-     * @param {string=} column [column=id]
-     * @return {promise<number>}
+     * execute data return result is exists
+     * @return {promise<boolean>}
      */
-    count(column = 'id') {
+    exists() {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', [
+            this.limit(1);
+            const sql = this._buildQueryStatement();
+            const result = yield this.queryStatement([
                 `${this.$constants('SELECT')}`,
-                `${this.$constants('COUNT')}(${column})`,
-                `${this.$constants('AS')} \`total\``
+                `${this.$constants('EXISTS')}`,
+                `(${sql})`,
+                `${this.$constants('AS')} \`aggregate\``
             ].join(' '));
-            const sql = this._buildQuery();
-            const result = yield this.queryStatement(sql);
-            this.$state.resetState();
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.total) || 0));
+            return Boolean(this.resultHandler(!!((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.aggregate) || false));
         });
     }
     /**
      *
-     * execute data return result is exists
-     * @return {promise<boolean>}
+     * execute data return number of results
+     * @param {string=} column [column=id]
+     * @return {promise<number>}
      */
-    exists() {
+    count(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.queryStatement([
-                `${this.$constants('SELECT')}`,
-                `${this.$constants('EXISTS')}(${this.$constants('SELECT')}`,
-                `*`,
-                `${this.$state.get('FROM')}`,
-                `${this.$state.get('TABLE_NAME')}`,
-                `${this.$state.get('WHERE')}`,
-                `${this.$constants('LIMIT')} 1) ${this.$constants('AS')} \`exists\``
-            ].join(' '));
-            return Boolean(this.resultHandler(!!((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.exists) || false));
+            const distinct = this.$state.get('DISTINCT');
+            column = distinct ? `${this.$constants('DISTINCT')} \`${column}\`` : `\`${column}\``;
+            this.selectRaw(`${this.$constants('COUNT')}(${column}) ${this.$constants('AS')} \`aggregate\``);
+            const sql = this._buildQueryStatement();
+            const result = yield this.queryStatement(sql);
+            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.aggregate) || 0));
         });
     }
     /**
@@ -1878,14 +1990,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     avg(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', [
-                `${this.$constants('SELECT')}`,
-                `${this.$constants('AVG')}(${column})`,
-                `${this.$constants('AS')} \`avg\``
-            ].join(' '));
-            const sql = this._buildQuery();
+            const distinct = this.$state.get('DISTINCT');
+            column = distinct ? `${this.$constants('DISTINCT')} \`${column}\`` : `\`${column}\``;
+            this.selectRaw(`${this.$constants('AVG')}(${column}) ${this.$constants('AS')} \`aggregate\``);
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.avg) || 0));
+            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.aggregate) || 0));
         });
     }
     /**
@@ -1897,10 +2007,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     sum(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('SUM')}(${column}) ${this.$constants('AS')} \`sum\``);
-            const sql = this._buildQuery();
+            const distinct = this.$state.get('DISTINCT');
+            column = distinct ? `${this.$constants('DISTINCT')} \`${column}\`` : `\`${column}\``;
+            this.selectRaw(`${this.$constants('SUM')}(${column}) ${this.$constants('AS')} \`aggregate\``);
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.sum) || 0));
+            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.aggregate) || 0));
         });
     }
     /**
@@ -1912,10 +2024,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     max(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('MAX')}(${column}) ${this.$constants('AS')} \`max\``);
-            const sql = this._buildQuery();
+            const distinct = this.$state.get('DISTINCT');
+            column = distinct ? `${this.$constants('DISTINCT')} \`${column}\`` : `\`${column}\``;
+            this.selectRaw(`${this.$constants('MAX')}(${column}) ${this.$constants('AS')} \`aggregate\``);
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.max) || 0));
+            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.aggregate) || 0));
         });
     }
     /**
@@ -1927,10 +2041,12 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     min(column = 'id') {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            this.$state.set('SELECT', `${this.$constants('SELECT')} ${this.$constants('MIN')}(${column}) ${this.$constants('AS')} \`min\``);
-            const sql = this._buildQuery();
+            const distinct = this.$state.get('DISTINCT');
+            column = distinct ? `${this.$constants('DISTINCT')} \`${column}\`` : `\`${column}\``;
+            this.selectRaw(`${this.$constants('MIN')}(${column}) ${this.$constants('AS')} \`aggregate\``);
+            const sql = this._buildQueryStatement();
             const result = yield this.queryStatement(sql);
-            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.min) || 0));
+            return Number(this.resultHandler(((_a = result === null || result === void 0 ? void 0 : result.shift()) === null || _a === void 0 ? void 0 : _a.aggregate) || 0));
         });
     }
     /**
@@ -1990,7 +2106,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 `, ${this.$constants('GROUP_CONCAT')}(id)`,
                 `${this.$constants('AS')} data`
             ].join(' '));
-            const sql = this._buildQuery();
+            const sql = this._buildQueryStatement();
             const results = yield this.queryStatement(sql);
             let data = [];
             results.forEach((result) => {
@@ -2442,6 +2558,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
     faker(rows = 1) {
         return __awaiter(this, void 0, void 0, function* () {
             let data = [];
+            this.void();
             const sql = [
                 `${this.$constants('SHOW')}`,
                 `${this.$constants('FIELDS')}`,
@@ -2558,7 +2675,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                         returnId: true
                     });
                     if (this.$state.get('VOID') || !result)
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const sql = [
                         `${this.$state.get('SELECT')}`,
                         `${this.$state.get('FROM')}`,
@@ -2599,7 +2716,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 returnId: true
             });
             if (this.$state.get('VOID') || !result)
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             const sql = [
                 `${this.$state.get('SELECT')}`,
                 `${this.$state.get('FROM')}`,
@@ -2624,7 +2741,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 returnId: true
             });
             if (this.$state.get('VOID') || !result)
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             const arrayId = [...Array(result)].map((_, i) => i + id);
             const sql = [
                 `${this.$state.get('SELECT')}`,
@@ -2663,7 +2780,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                         returnId: true
                     });
                     if (this.$state.get('VOID') || !result)
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const sql = [
                         `${this.$state.get('SELECT')}`,
                         `${this.$state.get('FROM')}`,
@@ -2721,7 +2838,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                         returnId: true
                     });
                     if (this.$state.get('VOID') || !result)
-                        return this.resultHandler(null);
+                        return this.resultHandler(undefined);
                     const sql = [
                         `${this.$state.get('SELECT')}`,
                         `${this.$state.get('FROM')}`,
@@ -2772,7 +2889,7 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
                 ].join(' ')
             });
             if (this.$state.get('VOID') || !result)
-                return this.resultHandler(null);
+                return this.resultHandler(undefined);
             const sql = [
                 `${this.$state.get('SELECT')}`,
                 `${this.$state.get('FROM')}`,
@@ -2866,45 +2983,6 @@ class Builder extends AbstractBuilder_1.AbstractBuilder {
             return 0;
         return value;
     }
-    _buildQuery() {
-        let sql = [];
-        while (true) {
-            if (this.$state.get('INSERT')) {
-                sql = [
-                    this.$state.get('INSERT')
-                ];
-                break;
-            }
-            if (this.$state.get('UPDATE')) {
-                sql = [
-                    this.$state.get('UPDATE'),
-                    this.$state.get('WHERE')
-                ];
-                break;
-            }
-            if (this.$state.get('DELETE')) {
-                sql = [
-                    this.$state.get('DELETE'),
-                    this.$state.get('WHERE')
-                ];
-                break;
-            }
-            sql = [
-                this.$state.get('SELECT'),
-                this.$state.get('FROM'),
-                this.$state.get('TABLE_NAME'),
-                this.$state.get('JOIN'),
-                this.$state.get('WHERE'),
-                this.$state.get('GROUP_BY'),
-                this.$state.get('HAVING'),
-                this.$state.get('ORDER_BY'),
-                this.$state.get('LIMIT'),
-                this.$state.get('OFFSET')
-            ];
-            break;
-        }
-        return sql.filter(s => s !== '' || s == null).join(' ');
-    }
     _initialConnection() {
         this.$utils = utils_1.utils;
         this.$pool = (() => {