@sfutureapps/db-sdk 0.3.27 → 0.3.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sfutureapps/db-sdk",
-  "version": "0.3.27",
+  "version": "0.3.31",
   "description": "SfutureApps JS SDK for ThinkPHP DB Gateway (MySQL)",
   "license": "MIT",
   "type": "module",

package/src/query-builder.js

@@ -24,8 +24,22 @@ export class QueryBuilder {
 
   // ---- select ----
   select(columns = "*") {
-    const cols = String(columns).trim();
-    this._select = cols === "*" || cols === "" ? [ "*" ] : cols.split(",").map(s => s.trim()).filter(Boolean);
+    const list = Array.isArray(columns) ? columns : String(columns).split(",");
+    const next = list.map(s => String(s).trim()).filter(Boolean);
+
+    if (next.length === 0 || next.includes("*")) {
+      this._select = [ "*" ];
+      return this;
+    }
+
+    if (this._select.length === 1 && this._select[ 0 ] === "*") {
+      this._select = next;
+      return this;
+    }
+
+    const set = new Set(this._select);
+    for (const col of next) set.add(col);
+    this._select = Array.from(set);
     return this;
   }
 
@@ -125,7 +139,7 @@ export class QueryBuilder {
   async execute() {
     const payload = {
       table: this.tableName,
-      select: this._select,
+      select: this._select.join(","),
       filters: JSON.stringify(this._filters),
 
       order: this._order,
@@ -139,7 +153,7 @@ export class QueryBuilder {
 
     if (this._page != null) payload.page = this._page;
     if (this._offset != null) payload.offset = this._offset;
-    if (this._joins.length > 0) payload.joins = this._joins;
+    if (this._joins.length > 0) payload.joins = JSON.stringify(this._joins);
 
     const res = await post({ endpoint: "v3/api/query", data: payload });