@iamkirbki/database-handler-core 4.1.6 → 4.3.0

package/dist/abstract/Model.d.ts

@@ -1,5 +1,5 @@
 import Repository from "../runtime/Repository.js";
-import { columnType, QueryCondition, QueryValues, ModelConfig, relation, QueryOptions, joinedEntity } from "../types/index.js";
+import { columnType, QueryWhereCondition, QueryValues, ModelConfig, relation, ExtraQueryParameters, joinedEntity } from "../types/index.js";
 /** Abstract Model class for ORM-style database interactions */
 export default abstract class Model<ModelType extends columnType> {
     private _repository?;
@@ -10,8 +10,8 @@ export default abstract class Model<ModelType extends columnType> {
     protected attributes: Partial<ModelType>;
     protected exists: boolean;
     protected dirty: boolean;
-    protected queryScopes?: QueryCondition;
-    protected queryOptions: QueryOptions;
+    protected queryScopes?: QueryWhereCondition;
+    protected queryOptions: ExtraQueryParameters;
     get primaryKeyColumn(): string;
     get primaryKey(): QueryValues | undefined;
     get values(): Partial<ModelType> | ModelType;
@@ -21,33 +21,38 @@ export default abstract class Model<ModelType extends columnType> {
     offset(value: number): this;
     static orderBy<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, column: string, direction?: 'ASC' | 'DESC'): ParamterModelType;
     orderBy(column: string, direction?: 'ASC' | 'DESC'): this;
-    static where<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, conditions: QueryCondition): ParamterModelType;
-    where(conditions: QueryCondition): this;
+    static where<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, conditions: QueryWhereCondition): ParamterModelType;
+    where(conditions: QueryWhereCondition): this;
     static whereId<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, id: QueryValues): ParamterModelType;
     whereId(id: QueryValues): this;
     static find<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue: QueryValues): ParamterModelType;
     find(primaryKeyValue: QueryValues): this;
-    static findOrFail<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue: QueryValues): Partial<columnType>;
-    findOrFail(primaryKeyValue?: QueryValues): Partial<ModelType> | ModelType;
-    static first<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue?: string | number): Promise<Partial<columnType> | ParamterModelType>;
-    first(primaryKeyValue?: string | number): Promise<Partial<ModelType>>;
-    get(): Promise<Partial<ModelType>[]>;
-    static all<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType): Promise<Partial<columnType>[]>;
-    all(): Promise<Partial<ModelType>[]>;
+    static findOrFail<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue: QueryValues): Promise<ParamterModelType>;
+    findOrFail(primaryKeyValue?: QueryValues): Promise<this>;
+    static first<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, primaryKeyValue?: string | number): Promise<ParamterModelType>;
+    first(primaryKeyValue?: string | number): Promise<this>;
+    get(): Promise<this[]>;
+    static all<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType): Promise<ParamterModelType[]>;
+    all(): Promise<this[]>;
     static set<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, attributes: Partial<columnType>): ParamterModelType;
     set(attributes: Partial<ModelType>): this;
     save(): Promise<this>;
-    update(attributes: Partial<ModelType>): this;
+    update(attributes: Partial<ModelType>): Promise<this>;
     protected joinedEntities: joinedEntity[];
     protected relations: relation[];
     get JoinedEntities(): joinedEntity[];
     get Relations(): relation[];
-    hasMany<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
-    hasOne<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
-    belongsTo<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
-    static with<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, relation: string, queryScopes?: QueryCondition): ParamterModelType;
-    with(relation: string, queryScopes?: QueryCondition): this;
-    private callRelationMethod;
+    insertRecordIntoPivotTable(otherTable: string, foreignKey: string): Promise<void>;
+    protected ManyToMany<modelType extends Model<columnType>>(model: modelType, pivotTable?: string, localKey?: string, foreignKey?: string, pivotForeignKey?: string, pivotLocalKey?: string): Promise<this>;
+    protected hasMany<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
+    protected hasOne<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
+    protected belongsTo<modelType extends Model<columnType>>(model: modelType, foreignKey?: string, localKey?: string): this;
+    static with<ParamterModelType extends Model<columnType>>(this: new () => ParamterModelType, relation: string, queryScopes?: QueryWhereCondition): ParamterModelType;
+    with(relation: string, queryScopes?: QueryWhereCondition): this;
+    asyncWith(relation: string, queryScopes?: QueryWhereCondition): Promise<this>;
+    callRelationMethod(relation: string): void | Promise<void>;
     private normalizeQueryScopes;
+    toJSON(): Partial<ModelType> | ModelType;
+    toObject(): Partial<ModelType> | ModelType;
 }
 //# sourceMappingURL=Model.d.ts.map

package/dist/abstract/Model.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/abstract/Model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Model.d.ts","sourceRoot":"","sources":["../../src/abstract/Model.ts"],"names":[],"mappings":"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"}

package/dist/abstract/Model.js

@@ -32,7 +32,7 @@ export default class Model {
     }
     get repository() {
         if (!this._repository) {
-            this._repository = Repository.getInstance(this.constructor, this.Configuration.table);
+            this._repository = Repository.getInstance(this.constructor, this.Configuration.table, this.Configuration.customAdapter);
         }
         return this._repository;
     }
@@ -43,7 +43,7 @@ export default class Model {
         return this.configuration.primaryKey;
     }
     get primaryKey() {
-        return this.attributes[this.configuration.primaryKey];
+        return this.originalAttributes[this.configuration.primaryKey];
     }
     get values() {
         return this.attributes;
@@ -100,22 +100,27 @@ export default class Model {
         return this;
     }
     static findOrFail(primaryKeyValue) {
-        const instance = new this();
-        return instance.findOrFail(primaryKeyValue);
+        return __awaiter(this, void 0, void 0, function* () {
+            const instance = new this();
+            return yield instance.findOrFail(primaryKeyValue);
+        });
     }
     findOrFail(primaryKeyValue) {
-        var _a;
-        if (primaryKeyValue) {
-            this.queryScopes = { [this.primaryKeyColumn]: primaryKeyValue };
-        }
-        const query = this.queryScopes || {};
-        (_a = this.repository) === null || _a === void 0 ? void 0 : _a.first(query, this).then((record) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (primaryKeyValue) {
+                this.queryScopes = { [this.primaryKeyColumn]: primaryKeyValue };
+            }
+            const query = this.queryScopes || {};
+            const record = yield ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.first(query, this));
             if (!record) {
                 throw new Error(`Record with primary key ${primaryKeyValue} not found.`);
             }
-            this.set(record);
+            this.attributes = record;
+            this.originalAttributes = Object.assign({}, this.attributes);
+            this.exists = true;
+            return this;
         });
-        return this.attributes;
     }
     static first(primaryKeyValue) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -126,13 +131,26 @@ export default class Model {
     first(primaryKeyValue) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            this.attributes = (yield ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.first(primaryKeyValue ? { [this.configuration.primaryKey]: primaryKeyValue } : {}, this)));
-            return this.attributes;
+            const attributes = yield ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.first(primaryKeyValue ? { [this.configuration.primaryKey]: primaryKeyValue } : this.queryScopes || {}, this));
+            if (attributes) {
+                this.attributes = attributes;
+                this.originalAttributes = Object.assign({}, attributes);
+                this.exists = true;
+            }
+            return this;
         });
     }
     get() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.repository.get(this.queryScopes || {}, this.queryOptions, this);
+            const records = yield this.repository.get(this.queryScopes || {}, this.queryOptions, this);
+            return records.map(record => {
+                const instance = new this.constructor();
+                instance.set(record);
+                instance.exists = true;
+                instance.originalAttributes = Object.assign({}, record);
+                instance.attributes = Object.assign({}, record);
+                return instance;
+            });
         });
     }
     static all() {
@@ -140,7 +158,17 @@ export default class Model {
         return instance.all();
     }
     all() {
-        return this.repository.all(this, this.queryScopes, this.queryOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const records = yield this.repository.all(this, this.queryScopes, this.queryOptions);
+            return records.map(record => {
+                const instance = new this.constructor();
+                instance.set(record);
+                instance.exists = true;
+                instance.originalAttributes = Object.assign({}, record);
+                instance.attributes = Object.assign({}, record);
+                return instance;
+            });
+        });
     }
     static set(attributes) {
         const instance = new this();
@@ -164,12 +192,21 @@ export default class Model {
         });
     }
     update(attributes) {
-        var _a;
-        if (!this.exists) {
-            throw new Error("Cannot update a model that does not exist in the database.");
-        }
-        (_a = this.repository) === null || _a === void 0 ? void 0 : _a.update(attributes);
-        return this;
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            if (!this.exists) {
+                throw new Error("Cannot update a model that does not exist in the database.");
+            }
+            if (this.primaryKey === undefined) {
+                throw new Error("Primary key value is undefined. Cannot update record without a valid primary key.");
+            }
+            const newRecord = yield ((_a = this.repository) === null || _a === void 0 ? void 0 : _a.update({ [this.primaryKeyColumn]: this.primaryKey }, attributes));
+            if (newRecord) {
+                this.originalAttributes = newRecord.values;
+                this.exists = true;
+            }
+            return this;
+        });
     }
     get JoinedEntities() {
         return this.joinedEntities;
@@ -177,6 +214,29 @@ export default class Model {
     get Relations() {
         return this.relations;
     }
+    insertRecordIntoPivotTable(otherTable, foreignKey) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.callRelationMethod(otherTable);
+            const relation = this.relations[this.relations.length - 1];
+            this.relations.pop();
+            yield this.repository.insertRecordIntoPivotTable(foreignKey, this, relation);
+        });
+    }
+    ManyToMany(model_1) {
+        return __awaiter(this, arguments, void 0, function* (model, pivotTable = [this.Configuration.table, model.Configuration.table].sort().join('_'), localKey = this.Configuration.primaryKey, foreignKey = model.Configuration.primaryKey, pivotForeignKey = `${this.Configuration.table}_${localKey}`, pivotLocalKey = `${model.Configuration.table}_${foreignKey}`) {
+            const relation = yield this.repository.getManyToManyRelation({
+                type: 'manyToMany',
+                model: model,
+                pivotTable: pivotTable,
+                foreignKey: foreignKey,
+                pivotForeignKey: pivotForeignKey,
+                localKey: localKey,
+                pivotLocalKey: pivotLocalKey,
+            });
+            this.relations.push(relation);
+            return this;
+        });
+    }
     hasMany(model, foreignKey = `${this.Configuration.table}_${this.Configuration.primaryKey}`, localKey = this.Configuration.primaryKey) {
         this.relations.push({
             type: 'hasMany',
@@ -209,7 +269,10 @@ export default class Model {
         return instance.with(relation, queryScopes);
     }
     with(relation, queryScopes) {
-        this.callRelationMethod(relation);
+        const result = this.callRelationMethod(relation);
+        if (result instanceof Promise) {
+            throw new Error(`Relation method '${relation}' is asynchronous. Use asyncWith() instead of with().`);
+        }
         const lastRelation = this.relations[this.relations.length - 1];
         const tableName = lastRelation.model.Configuration.table;
         const normalizedScopes = this.normalizeQueryScopes(queryScopes, tableName);
@@ -219,12 +282,28 @@ export default class Model {
         });
         return this;
     }
+    asyncWith(relation, queryScopes) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.callRelationMethod(relation);
+            const lastRelation = this.relations[this.relations.length - 1];
+            const tableName = lastRelation.model.Configuration.table;
+            const normalizedScopes = this.normalizeQueryScopes(queryScopes, tableName);
+            this.joinedEntities.push({
+                relation: relation,
+                queryScopes: normalizedScopes
+            });
+            return this;
+        });
+    }
     callRelationMethod(relation) {
         const method = Reflect.get(this, relation);
         if (typeof method !== 'function') {
-            throw new Error(`Relation method '${relation}' does not exist on ${this.constructor.name}`);
+            throw new Error(`Relation method '${relation}' does not exist`);
         }
-        method.call(this);
+        const result = method.call(this);
+        //@TODO: check if method is not static 
+        // Only return promise if the method is actually async
+        return result instanceof Promise ? result : undefined;
     }
     normalizeQueryScopes(queryScopes, tableName) {
         if (!queryScopes) {
@@ -239,4 +318,10 @@ export default class Model {
             : Query.ConvertParamsToArray(queryScopes);
         return scopesArray.map(scope => (Object.assign(Object.assign({}, scope), { column: `${tableName}.${scope.column}` })));
     }
+    toJSON() {
+        return this.attributes;
+    }
+    toObject() {
+        return this.attributes;
+    }
 }

package/dist/base/Query.d.ts

@@ -1,26 +1,32 @@
-import { columnType, QueryCondition, QueryWhereParameters, TableColumnInfo, QueryParameters } from "../types/index.js";
+import { columnType, QueryWhereCondition, QueryIsEqualParameter, TableColumnInfo, QueryComparisonParameters } from "../types/index.js";
 import { Record } from "../index.js";
+export type QueryConstructorType = {
+    tableName: string;
+    query?: string;
+    parameters?: QueryWhereCondition;
+    adapterName?: string;
+};
 /** Query class for executing custom SQL queries */
 export default class Query {
     readonly TableName: string;
     private readonly _adapter;
-    private _query;
+    private _query?;
     private _parameters;
-    get Parameters(): QueryCondition;
-    set Parameters(value: QueryCondition);
-    constructor(TableName: string, Query: string);
+    get Parameters(): QueryWhereCondition;
+    constructor({ tableName, query, parameters, adapterName }: QueryConstructorType);
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run<Type>(): Promise<Type>;
     /** Execute a SELECT query and return all matching rows */
     All<Type extends columnType>(): Promise<Record<Type>[]>;
     /** Execute a SELECT query and return the first matching row */
     Get<Type extends columnType>(): Promise<Record<Type> | undefined>;
-    static tableColumnInformation(tableName: string): Promise<TableColumnInfo[]>;
+    static TableColumnInformation(tableName: string, customAdapter?: string): Promise<TableColumnInfo[]>;
+    DoesTableExist(): Promise<boolean>;
     Count(): Promise<number>;
-    static ConvertParamsToArray(params: QueryCondition): QueryParameters[];
+    static ConvertParamsToArray(params: QueryWhereCondition): QueryComparisonParameters[];
     /** Convert various parameter formats to a consistent object format */
-    static ConvertParamsToObject(params: QueryCondition): QueryWhereParameters;
+    static ConvertParamsToObject(params: QueryWhereCondition): QueryIsEqualParameter;
     /** Databases don't like numeric values when inserting with a query */
-    static ConvertValueToString(params: QueryWhereParameters): QueryWhereParameters;
+    static ConvertValueToString(params: QueryIsEqualParameter): QueryIsEqualParameter;
 }
 //# sourceMappingURL=Query.d.ts.map

package/dist/base/Query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,oBAAoB,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC1H,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAErE,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA0D;IACnF,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,WAAW,CAAsB;IAEzC,IAAW,UAAU,IAAI,cAAc,CAEtC;IAED,IAAW,UAAU,CAAC,KAAK,EAAE,cAAc,EAE1C;gBAEW,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;IAK5C,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAKvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAMpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;WAM1D,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAI7E,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;WAMvB,oBAAoB,CAAC,MAAM,EAAE,cAAc,GAAG,eAAe,EAAE;IAkB7E,sEAAsE;WACxD,qBAAqB,CAAC,MAAM,EAAE,cAAc,GAAG,oBAAoB;IAajF,sEAAsE;WACxD,oBAAoB,CAAC,MAAM,EAAE,oBAAoB,GAAG,oBAAoB;CAKvF"}
+{"version":3,"file":"Query.d.ts","sourceRoot":"","sources":["../../src/base/Query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,eAAe,EAAE,yBAAyB,EAAE,MAAM,sBAAsB,CAAC;AAC1I,OAAO,EAAa,MAAM,EAAoB,MAAM,gBAAgB,CAAC;AAErE,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,mBAAmB,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,mDAAmD;AACnD,MAAM,CAAC,OAAO,OAAO,KAAK;IACxB,SAAgB,SAAS,EAAE,MAAM,CAAC;IAElC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAmB;IAC5C,OAAO,CAAC,MAAM,CAAC,CAAc;IAC7B,OAAO,CAAC,WAAW,CAA2B;IAE9C,IAAW,UAAU,IAAI,mBAAmB,CAE3C;gBAEW,EACV,SAAS,EACT,KAAK,EACL,UAAU,EACV,WAAW,EACZ,EAAE,oBAAoB;IAUvB,gEAAgE;IACnD,GAAG,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC;IAQvC,0DAA0D;IAC7C,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAUpE,+DAA+D;IAClD,GAAG,CAAC,IAAI,SAAS,UAAU,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;WAS1D,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IAIpG,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAIlC,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC;WASvB,oBAAoB,CAAC,MAAM,EAAE,mBAAmB,GAAG,yBAAyB,EAAE;IAkB5F,sEAAsE;WACxD,qBAAqB,CAAC,MAAM,EAAE,mBAAmB,GAAG,qBAAqB;IAavF,sEAAsE;WACxD,oBAAoB,CAAC,MAAM,EAAE,qBAAqB,GAAG,qBAAqB;CAKzF"}

package/dist/base/Query.js

@@ -13,19 +13,21 @@ export default class Query {
     get Parameters() {
         return this._parameters;
     }
-    set Parameters(value) {
-        this._parameters = Query.ConvertParamsToObject(value);
-    }
-    constructor(TableName, Query) {
-        this._adapter = Container.getInstance().getAdapter();
+    constructor({ tableName, query, parameters, adapterName }) {
         this._query = "";
         this._parameters = {};
-        this.TableName = TableName;
-        this._query = Query;
+        this.TableName = tableName;
+        this._query = query;
+        if (parameters)
+            this._parameters = Query.ConvertParamsToObject(parameters);
+        this._adapter = Container.getInstance().getAdapter(adapterName);
     }
     /** Execute a non-SELECT query (INSERT, UPDATE, DELETE, etc.) */
     Run() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                throw new Error("No query defined to run.");
+            }
             const stmt = yield this._adapter.prepare(this._query);
             return yield stmt.run(this.Parameters);
         });
@@ -33,26 +35,40 @@ export default class Query {
     /** Execute a SELECT query and return all matching rows */
     All() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                throw new Error("No query defined to run.");
+            }
             const stmt = yield this._adapter.prepare(this._query);
             const results = yield stmt.all(this.Parameters);
-            return results.map(res => new Record(res, this.TableName));
+            return results.map(res => new Record(this.TableName, res));
         });
     }
     /** Execute a SELECT query and return the first matching row */
     Get() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                throw new Error("No query defined to run.");
+            }
             const stmt = yield this._adapter.prepare(this._query);
             const results = yield stmt.get(this.Parameters);
-            return results ? new Record(results, this.TableName) : undefined;
+            return results ? new Record(this.TableName, results) : undefined;
+        });
+    }
+    static TableColumnInformation(tableName, customAdapter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Container.getInstance().getAdapter(customAdapter).tableColumnInformation(tableName);
         });
     }
-    static tableColumnInformation(tableName) {
+    DoesTableExist() {
         return __awaiter(this, void 0, void 0, function* () {
-            return Container.getInstance().getAdapter().tableColumnInformation(tableName);
+            return yield this._adapter.tableExists(this.TableName);
         });
     }
     Count() {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!this._query) {
+                throw new Error("No query defined to run.");
+            }
             const stmt = yield this._adapter.prepare(this._query);
             const result = yield stmt.get(this.Parameters);
             return parseInt(result.count) || 0;
@@ -90,7 +106,7 @@ export default class Query {
     /** Databases don't like numeric values when inserting with a query */
     static ConvertValueToString(params) {
         return Object.entries(params).map(([key, value]) => {
-            return { [key]: value !== null && value !== undefined ? value.toString() : value };
+            return { [key]: value !== null && !(value instanceof Date) && value !== undefined ? value.toString() : value };
         }).reduce((acc, curr) => (Object.assign(Object.assign({}, acc), curr)), {});
     }
 }

package/dist/base/Record.d.ts

@@ -1,17 +1,18 @@
 import { inspect } from "util";
-import { columnType } from "../types/index.js";
+import { columnType, QueryIsEqualParameter } from "../types/index.js";
 /** Record class represents a single database row */
 export default class Record<ColumnValuesType extends columnType> {
     private _values;
     private readonly _tableName;
-    constructor(values: ColumnValuesType, table: string);
+    private readonly _customAdapter?;
+    constructor(table: string, values: ColumnValuesType, adapter?: string);
     /** Get the raw values object for this record */
     get values(): ColumnValuesType;
     Insert(): Promise<this | undefined>;
     /** Update this record in the database */
-    Update(newValues: Partial<ColumnValuesType>): Promise<void>;
+    Update(newValues: Partial<ColumnValuesType>, whereParameters: QueryIsEqualParameter): Promise<this>;
     /** Delete this record from the database */
-    Delete(): Promise<void>;
+    Delete(primaryKey?: QueryIsEqualParameter): Promise<void>;
     /** Returns the values object for JSON.stringify() */
     toJSON(): ColumnValuesType;
     /** Convert record to pretty-printed JSON string */

package/dist/base/Record.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Record.d.ts","sourceRoot":"","sources":["../../src/base/Record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,UAAU,EAA0D,MAAM,sBAAsB,CAAC;AAG1G,oDAAoD;AACpD,MAAM,CAAC,OAAO,OAAO,MAAM,CAAC,gBAAgB,SAAS,UAAU;IAC3D,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;gBAExB,MAAM,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM;IAKnD,gDAAgD;IAChD,IAAW,MAAM,IAAI,gBAAgB,CAEpC;IAEY,MAAM,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IAuChD,yCAAyC;IAC5B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxE,2CAA2C;IAC9B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAOpC,qDAAqD;IAC9C,MAAM,IAAI,gBAAgB;IAIjC,mDAAmD;IAC5C,QAAQ,IAAI,MAAM;IAIzB,uCAAuC;IACvC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,gBAAgB;CAGvC"}
+{"version":3,"file":"Record.d.ts","sourceRoot":"","sources":["../../src/base/Record.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAoC,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAG3G,oDAAoD;AACpD,MAAM,CAAC,OAAO,OAAO,MAAM,CAAC,gBAAgB,SAAS,UAAU;IAC3D,OAAO,CAAC,OAAO,CAA4C;IAC3D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAS;IACpC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;gBAE7B,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,gBAAgB,EAAE,OAAO,CAAC,EAAE,MAAM;IAMrE,gDAAgD;IAChD,IAAW,MAAM,IAAI,gBAAgB,CAEpC;IAEY,MAAM,IAAI,OAAO,CAAC,IAAI,GAAG,SAAS,CAAC;IA+ChD,yCAAyC;IAC5B,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,gBAAgB,CAAC,EAAE,eAAe,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IA0BhH,2CAA2C;IAC9B,MAAM,CAAC,UAAU,CAAC,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBtE,qDAAqD;IAC9C,MAAM,IAAI,gBAAgB;IAIjC,mDAAmD;IAC5C,QAAQ,IAAI,MAAM;IAIzB,uCAAuC;IACvC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,gBAAgB;CAGvC"}

package/dist/base/Record.js

@@ -12,10 +12,11 @@ import Query from "./Query.js";
 import QueryStatementBuilder from "../helpers/QueryStatementBuilder.js";
 /** Record class represents a single database row */
 export default class Record {
-    constructor(values, table) {
+    constructor(table, values, adapter) {
         this._values = {};
-        this._values = values;
         this._tableName = table;
+        this._values = values;
+        this._customAdapter = adapter;
     }
     /** Get the raw values object for this record */
     get values() {
@@ -30,8 +31,12 @@ export default class Record {
                 throw new Error("Cannot insert record with no columns");
             }
             const queryStr = QueryStatementBuilder.BuildInsert(this._tableName, this._values);
-            const query = new Query(this._tableName, queryStr);
-            query.Parameters = this._values;
+            const query = new Query({
+                tableName: this._tableName,
+                query: queryStr,
+                parameters: this._values,
+                adapterName: this._customAdapter
+            });
             const result = yield query.Run();
             let recordId;
             // For PostgreSQL compatibility: use 'id' from values if lastInsertRowid is undefined
@@ -45,8 +50,12 @@ export default class Record {
                 return undefined;
             }
             const queryStrSelect = QueryStatementBuilder.BuildSelect(this._tableName, { where: Object.assign({}, this._values) });
-            const querySelect = new Query(this._tableName, queryStrSelect);
-            querySelect.Parameters = Object.assign({}, this._values);
+            const querySelect = new Query({
+                tableName: this._tableName,
+                query: queryStrSelect,
+                parameters: this._values,
+                adapterName: this._customAdapter
+            });
             const insertedRecord = yield querySelect.All();
             if (insertedRecord.length > 0) {
                 this._values = insertedRecord[insertedRecord.length - 1].values;
@@ -56,30 +65,43 @@ export default class Record {
         });
     }
     /** Update this record in the database */
-    Update(newValues) {
+    Update(newValues, whereParameters) {
         return __awaiter(this, void 0, void 0, function* () {
             const originalValues = this._values;
             if (originalValues.updated_at !== undefined) {
                 newValues.updated_at = new Date().toISOString();
             }
-            const queryStr = QueryStatementBuilder.BuildUpdate(this._tableName, newValues, originalValues);
-            const _query = new Query(this._tableName, queryStr);
+            const queryStr = QueryStatementBuilder.BuildUpdate(this._tableName, newValues, whereParameters);
             // Merge newValues and originalValues for parameters (with 'where_' prefix for where clause)
             const params = Object.assign({}, newValues);
             Object.entries(originalValues).forEach(([key, value]) => {
                 params[`where_${key}`] = value;
             });
-            _query.Parameters = params;
+            const _query = new Query({
+                tableName: this._tableName,
+                query: queryStr,
+                parameters: params,
+                adapterName: this._customAdapter
+            });
             yield _query.Run();
             this._values = Object.assign(Object.assign({}, this._values), newValues);
+            return this;
         });
     }
     /** Delete this record from the database */
-    Delete() {
+    Delete(primaryKey) {
         return __awaiter(this, void 0, void 0, function* () {
+            const originalValues = this._values;
+            if (originalValues.deleted_at !== undefined) {
+                this._values.deleted_at = new Date().toISOString();
+                yield this.Update(this._values, this._values.id ? { id: this._values.id } : primaryKey || {});
+                return;
+            }
             const queryStr = QueryStatementBuilder.BuildDelete(this._tableName, this._values);
-            const _query = new Query(this._tableName, queryStr);
-            _query.Parameters = Object.assign({}, this._values);
+            const _query = new Query({
+                tableName: this._tableName,
+                query: queryStr, parameters: this.values, adapterName: this._customAdapter
+            });
             yield _query.Run();
         });
     }

package/dist/base/Table.d.ts

@@ -1,25 +1,27 @@
-import { DefaultQueryOptions, Join, QueryOptions, ReadableTableColumnInfo, TableColumnInfo, columnType } from "../types/index.js";
+import { DefaultQueryParameters, Join, ExtraQueryParameters, ReadableTableColumnInfo, TableColumnInfo, columnType } from "../types/index.js";
 import { Record } from "../index.js";
 /** Table class for interacting with a database table */
 export default class Table {
+    private readonly _customAdapter?;
     private readonly _name;
     /** Private constructor - use Table.create() */
-    constructor(name: string);
+    constructor(name: string, customAdapter?: string);
     /** Get raw column information */
     TableColumnInformation(): Promise<TableColumnInfo[]>;
     /** Get readable, formatted column information */
     ReadableTableColumnInformation(): Promise<ReadableTableColumnInfo[]>;
     Drop(): Promise<void>;
     /** Fetch records with optional filtering, ordering, and pagination */
-    Records<Type extends columnType>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    Records<Type extends columnType>(options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type>[]>;
     /** Fetch a single record from the table */
-    Record<Type extends columnType>(options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type> | undefined>;
+    Record<Type extends columnType>(options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type> | undefined>;
     /** Get the total count of records */
     RecordsCount(): Promise<number>;
+    exists(): Promise<boolean>;
     /** Insert a record into the table */
     Insert<Type extends columnType>(values: Type): Promise<Record<Type> | undefined>;
     /** Perform JOIN operations with other tables */
-    Join<Type extends columnType>(Joins: Join | Join[], options?: DefaultQueryOptions & QueryOptions): Promise<Record<Type>[]>;
+    Join<Type extends columnType>(Joins: Join | Join[], options?: DefaultQueryParameters & ExtraQueryParameters): Promise<Record<Type>[]>;
     private splitJoinValues;
 }
 //# sourceMappingURL=Table.d.ts.map

package/dist/base/Table.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,mBAAmB,EACnB,IAAI,EACJ,YAAY,EACZ,uBAAuB,EACvB,eAAe,EACf,UAAU,EACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAS,MAAM,gBAAgB,CAAC;AAE/C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,+CAA+C;gBACnC,IAAI,EAAE,MAAM;IAIxB,iCAAiC;IACpB,sBAAsB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIjE,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAMlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAkB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAWpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAM5C,qCAAqC;IACxB,MAAM,CAAC,IAAI,SAAS,UAAU,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAM7F,gDAAgD;IACnC,IAAI,CAAC,IAAI,SAAS,UAAU,EACrC,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,mBAAmB,GAAG,YAAY,GAC7C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAcZ,eAAe;CA0BhC"}
+{"version":3,"file":"Table.d.ts","sourceRoot":"","sources":["../../src/base/Table.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,sBAAsB,EACtB,IAAI,EACJ,oBAAoB,EACpB,uBAAuB,EACvB,eAAe,EACf,UAAU,EACb,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,EAAS,MAAM,gBAAgB,CAAC;AAE/C,wDAAwD;AACxD,MAAM,CAAC,OAAO,OAAO,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAS;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAS;IAE/B,+CAA+C;gBACnC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM;IAKhD,iCAAiC;IACpB,sBAAsB,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAIjE,iDAAiD;IACpC,8BAA8B,IAAI,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAWpE,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAUlC,sEAAsE;IACzD,OAAO,CAAC,IAAI,SAAS,UAAU,EACxC,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;IAsB1B,2CAA2C;IAC9B,MAAM,CAAC,IAAI,SAAS,UAAU,EACvC,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAWpC,qCAAqC;IACxB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAS/B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC;IASvC,qCAAqC;IACxB,MAAM,CAAC,IAAI,SAAS,UAAU,EAAE,MAAM,EAAE,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;IAM7F,gDAAgD;IACnC,IAAI,CAAC,IAAI,SAAS,UAAU,EACrC,KAAK,EAAE,IAAI,GAAG,IAAI,EAAE,EACpB,OAAO,CAAC,EAAE,sBAAsB,GAAG,oBAAoB,GACxD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;YAsBZ,eAAe;CAgChC"}