leoric 2.10.0 → 2.10.2

package/Readme.md

@@ -118,3 +118,36 @@ If you are interested in fixing issues and contributing directly to the code bas
 ## egg-orm
 
 If developing web applications with [egg framework](https://eggjs.org/), it's highly recommended using the [egg-orm](https://github.com/eggjs/egg-orm) plugin. More detailed examples about setting up egg-orm with egg framework in either JavaScript or TypeScript can be found at <https://github.com/eggjs/egg-orm/tree/master/examples>
+
+## mysql nuances
+
+macOS binds localhost to ipv6 `::1`, yet both mysql and mysql2 connect database with localhost by default, which means both will try connecting to mysql with `::1`. However, the mysql distribution installed with HomeBrew sets `bind_address = 127.0.0.1`, hence causes following error:
+
+```js
+Error: connect ECONNREFUSED ::1:3306
+  at __node_internal_captureLargerStackTrace (node:internal/errors:490:5)
+  at __node_internal_exceptionWithHostPort (node:internal/errors:668:12)
+  at TCPConnectWrap.afterConnect [as oncomplete] (node:net:1494:16)
+```
+
+Please change the configuration as below:
+
+```diff
+diff --git a/usr/local/etc/my.cnf b/usr/local/etc/my.cnf
+index 7218354..d31859c 100644
+--- a/usr/local/etc/my.cnf
++++ b/usr/local/etc/my.cnf
+@@ -1,5 +1,5 @@
+ # Default Homebrew MySQL server config
+ [mysqld]
+ # Only allow connections from localhost
+-bind-address = 127.0.0.1
++bind-address = 127.0.0.1,::1
+ mysqlx-bind-address = 127.0.0.1
+ ```
+
+ and restart the mysql service:
+
+ ```bash
+ brew services mysql restart
+ ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leoric",
-  "version": "2.10.0",
+  "version": "2.10.2",
   "description": "JavaScript Object-relational mapping alchemy",
   "main": "index.js",
   "types": "index.d.ts",

package/src/realm.js

@@ -35,7 +35,8 @@ async function findModels(dir) {
   for (const entry of entries) {
     const extname = path.extname(entry.name);
     if (entry.isFile() && ['.js', '.mjs'].includes(extname)) {
-      const model = require(path.join(dir, entry.name));
+      const exports = require(path.join(dir, entry.name));
+      const model = exports.__esModule ? exports.default : exports;
       if (isBone(model)) models.push(model);
     }
   }

package/src/spell.js

@@ -387,13 +387,11 @@ class Spell {
 
   #emptySpell() {
     Object.assign(this, {
-      columns: [],
       whereConditions: [],
       groups: [],
-      orders: [],
+      orders: JSON.parse(JSON.stringify(this.orders)),
       havingConditions: [],
       joins: {},
-      skip: 0,
       subqueryIndex: 0,
       rowCount: 0,
       skip: 0,
@@ -807,6 +805,7 @@ class Spell {
   $with(...qualifiers) {
     if (this.rowCount > 0 || this.skip > 0) {
       const spell = this.dup;
+      spell.columns = [];
       this.#emptySpell();
       this.table = { type: 'subquery', value: spell };
     }