@itrocks/mysql 0.0.18 → 0.0.20

package/cjs/mysql.js

@@ -134,8 +134,8 @@ class Mysql extends storage_1.DataSource {
                 : property.name;
             const columnName = depends.columnOf(propertyName);
             sql.push((columnName.length !== propertyName.length)
-                ? columnName + ' ' + propertyName
-                : propertyName);
+                ? ('`' + columnName + '` `' + propertyName + '`')
+                : ('`' + propertyName + '`'));
         }
         return sql.join(', ');
     }
@@ -244,20 +244,24 @@ class Mysql extends storage_1.DataSource {
         const propertiesSql = this.propertiesToSqlSelect(type);
         let sortOption = undefined;
         for (const option of this.options(options)) {
-            if ((option instanceof storage_2.Sort) && (option.properties.length)) {
-                sortOption = option;
+            if (option === storage_2.Sort) {
+                sortOption = new storage_2.Sort((0, sort_2.sortOf)(type));
+            }
+            if (option instanceof storage_2.Sort) {
+                sortOption = option.properties.length ? option : new storage_2.Sort((0, sort_2.sortOf)(type));
             }
-        }
-        if (!sortOption) {
-            sortOption = new storage_2.Sort((0, sort_2.sortOf)(type));
         }
         Object.setPrototypeOf(search, type.prototype);
         const sql = this.propertiesToSearchSql(search);
         const [values] = await this.valuesToDb(search);
         if (exports.DEBUG)
             console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
-        const sort = ' ORDER BY '
-            + sortOption.properties.map(property => '`' + property + '`' + (property instanceof sort_1.Reverse ? ' DESC' : '')).join(', ');
+        const sort = sortOption?.properties.length
+            ? ' ORDER BY '
+                + sortOption.properties
+                    .map(property => '`' + property + '`' + (property instanceof sort_1.Reverse ? ' DESC' : ''))
+                    .join(', ')
+            : '';
         const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql + sort, Object.values(values));
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }

package/esm/mysql.js

@@ -129,8 +129,8 @@ export class Mysql extends DataSource {
                 : property.name;
             const columnName = depends.columnOf(propertyName);
             sql.push((columnName.length !== propertyName.length)
-                ? columnName + ' ' + propertyName
-                : propertyName);
+                ? ('`' + columnName + '` `' + propertyName + '`')
+                : ('`' + propertyName + '`'));
         }
         return sql.join(', ');
     }
@@ -239,20 +239,24 @@ export class Mysql extends DataSource {
         const propertiesSql = this.propertiesToSqlSelect(type);
         let sortOption = undefined;
         for (const option of this.options(options)) {
-            if ((option instanceof Sort) && (option.properties.length)) {
-                sortOption = option;
+            if (option === Sort) {
+                sortOption = new Sort(sortOf(type));
+            }
+            if (option instanceof Sort) {
+                sortOption = option.properties.length ? option : new Sort(sortOf(type));
             }
-        }
-        if (!sortOption) {
-            sortOption = new Sort(sortOf(type));
         }
         Object.setPrototypeOf(search, type.prototype);
         const sql = this.propertiesToSearchSql(search);
         const [values] = await this.valuesToDb(search);
         if (DEBUG)
             console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
-        const sort = ' ORDER BY '
-            + sortOption.properties.map(property => '`' + property + '`' + (property instanceof Reverse ? ' DESC' : '')).join(', ');
+        const sort = sortOption?.properties.length
+            ? ' ORDER BY '
+                + sortOption.properties
+                    .map(property => '`' + property + '`' + (property instanceof Reverse ? ' DESC' : ''))
+                    .join(', ')
+            : '';
         const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql + sort, Object.values(values));
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }

package/package.json

@@ -59,5 +59,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json"
 	},
 	"types": "./esm/mysql.d.ts",
-	"version": "0.0.18"
+	"version": "0.0.20"
 }