@stonyx/orm 0.2.1-beta.80 → 0.2.1-beta.81

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.2.1-beta.80",
+  "version": "0.2.1-beta.81",
   "description": "",
   "main": "src/main.js",
   "type": "module",

package/src/main.js

@@ -111,9 +111,9 @@ export default class Orm {
 
     if (config.orm.mysql) {
       const { default: MysqlDB } = await import('./mysql/mysql-db.js');
-      this.mysqlDb = new MysqlDB();
-      this.db = this.mysqlDb;
-      promises.push(this.mysqlDb.init());
+      this.sqlDb = new MysqlDB();
+      this.db = this.sqlDb;
+      promises.push(this.sqlDb.init());
     } else if (this.options.dbType !== 'none') {
       const db = new DB();
       this.db = db;
@@ -131,9 +131,9 @@ export default class Orm {
       return modelClass?.memory === true;
     };
 
-    // Wire up MySQL reference for on-demand queries from store.find()/findAll()
-    if (this.mysqlDb) {
-      Orm.store._mysqlDb = this.mysqlDb;
+    // Wire up SQL adapter reference for on-demand queries from store.find()/findAll()
+    if (this.sqlDb) {
+      Orm.store._sqlDb = this.sqlDb;
     }
 
     Orm.ready = await Promise.all(promises);
@@ -141,11 +141,11 @@ export default class Orm {
   }
 
   async startup() {
-    if (this.mysqlDb) await this.mysqlDb.startup();
+    if (this.sqlDb) await this.sqlDb.startup();
   }
 
   async shutdown() {
-    if (this.mysqlDb) await this.mysqlDb.shutdown();
+    if (this.sqlDb) await this.sqlDb.shutdown();
   }
 
   static get db() {

package/src/manage-record.js

@@ -110,10 +110,10 @@ export function updateRecord(record, rawData, userOptions={}) {
 function assignRecordId(modelName, rawData) {
   if (rawData.id) return;
 
-  // In MySQL mode with numeric IDs, defer to MySQL auto-increment
-  if (Orm.instance?.mysqlDb && !isStringIdModel(modelName)) {
+  // In SQL mode with numeric IDs, defer to database auto-increment
+  if (Orm.instance?.sqlDb && !isStringIdModel(modelName)) {
     rawData.id = `__pending_${Date.now()}_${Math.random()}`;
-    rawData.__pendingMysqlId = true;
+    rawData.__pendingSqlId = true;
     return;
   }
 

package/src/mysql/mysql-db.js

@@ -352,7 +352,7 @@ export default class MysqlDB {
     const insertData = this._recordToRow(record, schema);
 
     // For auto-increment models, remove the pending ID
-    const isPendingId = record.__data.__pendingMysqlId;
+    const isPendingId = record.__data.__pendingSqlId;
 
     if (isPendingId) {
       delete insertData.id;
@@ -380,7 +380,7 @@ export default class MysqlDB {
         response.data.id = realId;
       }
 
-      delete record.__data.__pendingMysqlId;
+      delete record.__data.__pendingSqlId;
     }
   }
 

package/src/orm-request.js

@@ -385,9 +385,9 @@ export default class OrmRequest extends Request {
       // Execute main handler
       const response = await handler(request, state);
 
-      // Persist to MySQL for write operations
-      if (Orm.instance.mysqlDb && WRITE_OPERATIONS.has(operation)) {
-        await Orm.instance.mysqlDb.persist(operation, this.model, context, response);
+      // Persist to SQL database for write operations
+      if (Orm.instance.sqlDb && WRITE_OPERATIONS.has(operation)) {
+        await Orm.instance.sqlDb.persist(operation, this.model, context, response);
       }
 
       // Add response and relevant records to context

package/src/store.js

@@ -22,15 +22,15 @@ export default class Store {
   }
 
   /**
-   * Async authoritative read. Always queries MySQL for memory: false models.
+   * Async authoritative read. Always queries the SQL database for memory: false models.
    * For memory: true models, returns from store (already loaded on boot).
    * @param {string} modelName - The model name
    * @param {string|number} id - The record ID
    * @returns {Promise<Record|undefined>}
    */
   async find(modelName, id) {
-    // For views in non-MySQL mode, use view resolver
-    if (Orm.instance?.isView?.(modelName) && !this._mysqlDb) {
+    // For views in non-SQL mode, use view resolver
+    if (Orm.instance?.isView?.(modelName) && !this._sqlDb) {
       const resolver = new ViewResolver(modelName);
       return resolver.resolveOne(id);
     }
@@ -40,12 +40,12 @@ export default class Store {
       return this.get(modelName, id);
     }
 
-    // For memory: false models, always query MySQL
-    if (this._mysqlDb) {
-      return this._mysqlDb.findRecord(modelName, id);
+    // For memory: false models, always query the SQL database
+    if (this._sqlDb) {
+      return this._sqlDb.findRecord(modelName, id);
     }
 
-    // Fallback to store (JSON mode or no MySQL)
+    // Fallback to store (JSON mode or no SQL adapter)
     return this.get(modelName, id);
   }
 
@@ -57,8 +57,8 @@ export default class Store {
    * @returns {Promise<Record[]>}
    */
   async findAll(modelName, conditions) {
-    // For views in non-MySQL mode, use view resolver
-    if (Orm.instance?.isView?.(modelName) && !this._mysqlDb) {
+    // For views in non-SQL mode, use view resolver
+    if (Orm.instance?.isView?.(modelName) && !this._sqlDb) {
       const resolver = new ViewResolver(modelName);
       const records = await resolver.resolveAll();
 
@@ -75,9 +75,9 @@ export default class Store {
       return modelStore ? Array.from(modelStore.values()) : [];
     }
 
-    // For memory: false models (or filtered queries), always query MySQL
-    if (this._mysqlDb) {
-      return this._mysqlDb.findAll(modelName, conditions);
+    // For memory: false models (or filtered queries), always query the SQL database
+    if (this._sqlDb) {
+      return this._sqlDb.findAll(modelName, conditions);
     }
 
     // Fallback to store (JSON mode) — apply conditions in-memory if provided
@@ -101,8 +101,8 @@ export default class Store {
    * @returns {Promise<Record[]>}
    */
   async query(modelName, conditions = {}) {
-    if (this._mysqlDb) {
-      return this._mysqlDb.findAll(modelName, conditions);
+    if (this._sqlDb) {
+      return this._sqlDb.findAll(modelName, conditions);
     }
 
     // Fallback: filter in-memory store
@@ -125,10 +125,10 @@ export default class Store {
   _memoryResolver = null;
 
   /**
-   * Set by Orm during init — reference to the MysqlDB instance for on-demand queries.
-   * @type {MysqlDB|null}
+   * Set by Orm during init — reference to the SQL adapter instance for on-demand queries.
+   * @type {object|null}
    */
-  _mysqlDb = null;
+  _sqlDb = null;
 
   /**
    * Check if a model is configured for in-memory storage.