@itrocks/mysql 0.0.8 → 0.0.10

package/cjs/mysql.d.ts

@@ -1,8 +1,12 @@
 import { AnyObject } from '@itrocks/class-type';
-import { KeyOf, ObjectOrType, Type } from '@itrocks/class-type';
+import { KeyOf } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
+import { Type } from '@itrocks/class-type';
 import { DataSource } from '@itrocks/storage';
-import { Entity, MayEntity } from '@itrocks/storage';
-import { Identifier, SearchType } from '@itrocks/storage';
+import { Entity } from '@itrocks/storage';
+import { MayEntity } from '@itrocks/storage';
+import { Identifier } from '@itrocks/storage';
+import { SearchType } from '@itrocks/storage';
 import { Connection } from 'mariadb';
 export declare const DEBUG = false;
 interface Dependencies<QF extends object = object> {
@@ -16,8 +20,7 @@ interface Dependencies<QF extends object = object> {
     storeOf: <T extends object>(target: ObjectOrType<T>) => string | false;
 }
 export declare function mysqlDependsOn<QF extends object = object>(dependencies: Partial<Dependencies<QF>>): void;
-export { Mysql };
-export default class Mysql extends DataSource {
+export declare class Mysql extends DataSource {
     config: {
         host: string;
         user: string;
@@ -39,6 +42,7 @@ export default class Mysql extends DataSource {
     insertRelatedId<T extends Entity>(object: T, property: KeyOf<T>, id: Identifier): Promise<void>;
     propertiesToSearchSql(search: AnyObject): string;
     propertiesToSql(object: object): string;
+    propertiesToSqlSelect<T extends object>(type: Type<T>): string;
     read<T extends object>(type: Type<T>, id: Identifier): Promise<Entity<T>>;
     readCollection<T extends object, PT extends object>(object: Entity<T>, property: KeyOf<T>, type?: Type<PT>): Promise<Awaited<PT & {
         id: Identifier;
@@ -53,3 +57,4 @@ export default class Mysql extends DataSource {
     valuesFromDb<T extends object>(record: Entity<T>, type: Type<T>): Promise<Entity<T>>;
     valuesToDb<T extends object>(object: T): Promise<[AnyObject, Function[]]>;
 }
+export {};

package/cjs/mysql.js

@@ -4,7 +4,9 @@ exports.Mysql = exports.DEBUG = void 0;
 exports.mysqlDependsOn = mysqlDependsOn;
 const class_type_1 = require("@itrocks/class-type");
 const class_type_2 = require("@itrocks/class-type");
+const class_type_3 = require("@itrocks/class-type");
 const reflect_1 = require("@itrocks/reflect");
+const reflect_2 = require("@itrocks/reflect");
 const storage_1 = require("@itrocks/storage");
 const mariadb_1 = require("mariadb");
 exports.DEBUG = false;
@@ -17,7 +19,7 @@ const depends = {
     QueryFunction: class {
     },
     queryFunctionCall: () => [undefined, ' = ?'],
-    storeOf: target => (0, class_type_2.typeOf)(target).name.toLowerCase()
+    storeOf: target => (0, class_type_3.typeOf)(target).name.toLowerCase()
 };
 function mysqlDependsOn(dependencies) {
     Object.assign(depends, dependencies);
@@ -49,7 +51,7 @@ class Mysql extends storage_1.DataSource {
     async deleteRelatedId(object, property, id) {
         const connection = this.connection ?? await this.connect();
         const objectTable = depends.storeOf(object);
-        const propertyTable = depends.storeOf(new reflect_1.ReflectProperty(object, property).collectionType.elementType);
+        const propertyTable = depends.storeOf(new reflect_2.ReflectProperty(object, property).collectionType.elementType);
         const joinTable = [objectTable, propertyTable].sort().join('_');
         const query = 'DELETE FROM `' + joinTable + '` WHERE ' + objectTable + '_id = ? AND ' + propertyTable + '_id = ?';
         const values = [object.id, id];
@@ -75,7 +77,7 @@ class Mysql extends storage_1.DataSource {
     async insertRelatedId(object, property, id) {
         const connection = this.connection ?? await this.connect();
         const objectTable = depends.storeOf(object);
-        const propertyTable = depends.storeOf(new reflect_1.ReflectProperty(object, property).collectionType.elementType);
+        const propertyTable = depends.storeOf(new reflect_2.ReflectProperty(object, property).collectionType.elementType);
         const joinTable = [objectTable, propertyTable].sort().join('_');
         const query = 'INSERT INTO `' + joinTable + '` SET ' + objectTable + '_id = ?, ' + propertyTable + '_id = ?';
         const values = [object.id, id];
@@ -103,31 +105,47 @@ class Mysql extends storage_1.DataSource {
     propertiesToSql(object) {
         return Object.keys(object).map(name => '`' + depends.columnOf(name) + '` = ?').join(', ');
     }
+    propertiesToSqlSelect(type) {
+        const sql = ['id'];
+        for (const property of new reflect_1.ReflectClass(type).properties) {
+            const propertyType = property.type;
+            const propertyName = ((0, class_type_2.isAnyType)(propertyType) && depends.storeOf(propertyType))
+                ? property.name + 'Id'
+                : property.name;
+            const columnName = depends.columnOf(propertyName);
+            sql.push((columnName.length !== propertyName.length)
+                ? columnName + ' ' + propertyName
+                : propertyName);
+        }
+        return sql.join(', ');
+    }
     async read(type, id) {
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         if (exports.DEBUG)
-            console.log('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
-        const rows = await connection.query('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
+            console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
         return this.valuesFromDb(rows[0], type);
     }
-    async readCollection(object, property, type = new reflect_1.ReflectProperty(object, property).collectionType.elementType) {
+    async readCollection(object, property, type = new reflect_2.ReflectProperty(object, property).collectionType.elementType) {
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         const objectTable = depends.storeOf(object);
         const table = depends.storeOf(type);
         let query;
         if (depends.componentOf(object, property)) {
-            query = 'SELECT * FROM `' + table + '` WHERE ' + objectTable + '_id = ?';
+            query = 'SELECT ' + propertiesSql + ' FROM `' + table + '` WHERE ' + objectTable + '_id = ?';
         }
         else {
             const joinTable = [objectTable, table].sort().join('_');
-            query = 'SELECT `' + table + '`.* FROM `' + table + '`'
+            query = 'SELECT `' + table + '`.' + propertiesSql + ' FROM `' + table + '`'
                 + ' INNER JOIN `' + joinTable + '` ON `' + joinTable + '`.' + table + '_id = `' + table + '`.id'
                 + ' WHERE `' + joinTable + '`.' + objectTable + '_id = ?';
         }
         const rows = await connection.query(query, [object.id]);
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
-    async readCollectionIds(object, property, type = new reflect_1.ReflectProperty(object, property).collectionType.elementType) {
+    async readCollectionIds(object, property, type = new reflect_2.ReflectProperty(object, property).collectionType.elementType) {
         const connection = this.connection ?? await this.connect();
         const objectTable = depends.storeOf(object);
         const propertyTable = depends.storeOf(type);
@@ -147,10 +165,11 @@ class Mysql extends storage_1.DataSource {
         if (!ids.length)
             return [];
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         const questionMarks = Array(ids.length).fill('?').join(', ');
         if (exports.DEBUG)
-            console.log('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
-        const rows = await connection.query('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
+            console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
     async save(object) {
@@ -160,12 +179,13 @@ class Mysql extends storage_1.DataSource {
     }
     async search(type, search = {}) {
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         Object.setPrototypeOf(search, type.prototype);
         const sql = this.propertiesToSearchSql(search);
         const [values] = await this.valuesToDb(search);
         if (exports.DEBUG)
-            console.log('SELECT * FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
-        const rows = await connection.query('SELECT * FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values));
+            console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values));
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
     async update(object) {
@@ -189,8 +209,8 @@ class Mysql extends storage_1.DataSource {
             if (value === depends.ignoreTransformedValue)
                 continue;
             object[property] = value;
-            if (property.endsWith('_id')) {
-                delete object[property.slice(0, -3)];
+            if (property.endsWith('Id')) {
+                delete object[property.slice(0, -2)];
             }
         }
         return object;
@@ -206,11 +226,10 @@ class Mysql extends storage_1.DataSource {
                 deferred.push(value);
                 continue;
             }
-            record[property] = value;
+            record[depends.columnOf(property)] = value;
         }
         return [record, deferred];
     }
 }
-exports.default = Mysql;
 exports.Mysql = Mysql;
 //# sourceMappingURL=mysql.js.map

package/esm/mysql.d.ts

@@ -1,8 +1,12 @@
 import { AnyObject } from '@itrocks/class-type';
-import { KeyOf, ObjectOrType, Type } from '@itrocks/class-type';
+import { KeyOf } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
+import { Type } from '@itrocks/class-type';
 import { DataSource } from '@itrocks/storage';
-import { Entity, MayEntity } from '@itrocks/storage';
-import { Identifier, SearchType } from '@itrocks/storage';
+import { Entity } from '@itrocks/storage';
+import { MayEntity } from '@itrocks/storage';
+import { Identifier } from '@itrocks/storage';
+import { SearchType } from '@itrocks/storage';
 import { Connection } from 'mariadb';
 export declare const DEBUG = false;
 interface Dependencies<QF extends object = object> {
@@ -16,8 +20,7 @@ interface Dependencies<QF extends object = object> {
     storeOf: <T extends object>(target: ObjectOrType<T>) => string | false;
 }
 export declare function mysqlDependsOn<QF extends object = object>(dependencies: Partial<Dependencies<QF>>): void;
-export { Mysql };
-export default class Mysql extends DataSource {
+export declare class Mysql extends DataSource {
     config: {
         host: string;
         user: string;
@@ -39,6 +42,7 @@ export default class Mysql extends DataSource {
     insertRelatedId<T extends Entity>(object: T, property: KeyOf<T>, id: Identifier): Promise<void>;
     propertiesToSearchSql(search: AnyObject): string;
     propertiesToSql(object: object): string;
+    propertiesToSqlSelect<T extends object>(type: Type<T>): string;
     read<T extends object>(type: Type<T>, id: Identifier): Promise<Entity<T>>;
     readCollection<T extends object, PT extends object>(object: Entity<T>, property: KeyOf<T>, type?: Type<PT>): Promise<Awaited<PT & {
         id: Identifier;
@@ -53,3 +57,4 @@ export default class Mysql extends DataSource {
     valuesFromDb<T extends object>(record: Entity<T>, type: Type<T>): Promise<Entity<T>>;
     valuesToDb<T extends object>(object: T): Promise<[AnyObject, Function[]]>;
 }
+export {};

package/esm/mysql.js

@@ -1,5 +1,7 @@
 import { isAnyFunction } from '@itrocks/class-type';
+import { isAnyType } from '@itrocks/class-type';
 import { typeOf } from '@itrocks/class-type';
+import { ReflectClass } from '@itrocks/reflect';
 import { ReflectProperty } from '@itrocks/reflect';
 import { DataSource } from '@itrocks/storage';
 import { createConnection } from 'mariadb';
@@ -18,8 +20,7 @@ const depends = {
 export function mysqlDependsOn(dependencies) {
     Object.assign(depends, dependencies);
 }
-export { Mysql };
-export default class Mysql extends DataSource {
+export class Mysql extends DataSource {
     config;
     connection;
     constructor(config) {
@@ -100,24 +101,40 @@ export default class Mysql extends DataSource {
     propertiesToSql(object) {
         return Object.keys(object).map(name => '`' + depends.columnOf(name) + '` = ?').join(', ');
     }
+    propertiesToSqlSelect(type) {
+        const sql = ['id'];
+        for (const property of new ReflectClass(type).properties) {
+            const propertyType = property.type;
+            const propertyName = (isAnyType(propertyType) && depends.storeOf(propertyType))
+                ? property.name + 'Id'
+                : property.name;
+            const columnName = depends.columnOf(propertyName);
+            sql.push((columnName.length !== propertyName.length)
+                ? columnName + ' ' + propertyName
+                : propertyName);
+        }
+        return sql.join(', ');
+    }
     async read(type, id) {
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         if (DEBUG)
-            console.log('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
-        const rows = await connection.query('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
+            console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id = ?', [id]);
         return this.valuesFromDb(rows[0], type);
     }
     async readCollection(object, property, type = new ReflectProperty(object, property).collectionType.elementType) {
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         const objectTable = depends.storeOf(object);
         const table = depends.storeOf(type);
         let query;
         if (depends.componentOf(object, property)) {
-            query = 'SELECT * FROM `' + table + '` WHERE ' + objectTable + '_id = ?';
+            query = 'SELECT ' + propertiesSql + ' FROM `' + table + '` WHERE ' + objectTable + '_id = ?';
         }
         else {
             const joinTable = [objectTable, table].sort().join('_');
-            query = 'SELECT `' + table + '`.* FROM `' + table + '`'
+            query = 'SELECT `' + table + '`.' + propertiesSql + ' FROM `' + table + '`'
                 + ' INNER JOIN `' + joinTable + '` ON `' + joinTable + '`.' + table + '_id = `' + table + '`.id'
                 + ' WHERE `' + joinTable + '`.' + objectTable + '_id = ?';
         }
@@ -144,10 +161,11 @@ export default class Mysql extends DataSource {
         if (!ids.length)
             return [];
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         const questionMarks = Array(ids.length).fill('?').join(', ');
         if (DEBUG)
-            console.log('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
-        const rows = await connection.query('SELECT * FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
+            console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '` WHERE id IN (' + questionMarks + ')', ids);
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
     async save(object) {
@@ -157,12 +175,13 @@ export default class Mysql extends DataSource {
     }
     async search(type, search = {}) {
         const connection = this.connection ?? await this.connect();
+        const propertiesSql = this.propertiesToSqlSelect(type);
         Object.setPrototypeOf(search, type.prototype);
         const sql = this.propertiesToSearchSql(search);
         const [values] = await this.valuesToDb(search);
         if (DEBUG)
-            console.log('SELECT * FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
-        const rows = await connection.query('SELECT * FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values));
+            console.log('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, '[', values, ']');
+        const rows = await connection.query('SELECT ' + propertiesSql + ' FROM `' + depends.storeOf(type) + '`' + sql, Object.values(values));
         return Promise.all(rows.map(row => this.valuesFromDb(row, type)));
     }
     async update(object) {
@@ -186,8 +205,8 @@ export default class Mysql extends DataSource {
             if (value === depends.ignoreTransformedValue)
                 continue;
             object[property] = value;
-            if (property.endsWith('_id')) {
-                delete object[property.slice(0, -3)];
+            if (property.endsWith('Id')) {
+                delete object[property.slice(0, -2)];
             }
         }
         return object;
@@ -203,7 +222,7 @@ export default class Mysql extends DataSource {
                 deferred.push(value);
                 continue;
             }
-            record[property] = value;
+            record[depends.columnOf(property)] = value;
         }
         return [record, deferred];
     }

package/package.json

@@ -58,5 +58,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json"
 	},
 	"types": "./esm/mysql.d.ts",
-	"version": "0.0.8"
+	"version": "0.0.10"
 }