diff --git a/dist/utils/grab-join-fields-from-query-object.js b/dist/utils/grab-join-fields-from-query-object.js index 54147c3..f504a54 100644 --- a/dist/utils/grab-join-fields-from-query-object.js +++ b/dist/utils/grab-join-fields-from-query-object.js @@ -27,19 +27,24 @@ export default function grabJoinFieldsFromQueryObject({ query }) { function grabSingleJoinData({ join, }) { let values = []; const join_select_fields = join?.selectFields; - if (join_select_fields) { + if (join_select_fields?.[0]) { for (let i = 0; i < join_select_fields.length; i++) { const select_field = join_select_fields[i]; if (select_field) { - const value = join.match; values.push({ + table: join.tableName, field: typeof select_field == "object" ? String(select_field.field) : String(select_field), - table: join.tableName, }); } } } + if (join.group_concat) { + values.push({ + table: join.tableName, + field: join.group_concat.field, + }); + } return values; } diff --git a/package.json b/package.json index db0a143..8855131 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@moduletrace/bun-sqlite", - "version": "1.0.39", + "version": "1.0.40", "description": "SQLite manager for Bun", "author": "Benjamin Toby", "main": "dist/index.js", diff --git a/src/utils/grab-join-fields-from-query-object.ts b/src/utils/grab-join-fields-from-query-object.ts index 6ef5754..f30376b 100644 --- a/src/utils/grab-join-fields-from-query-object.ts +++ b/src/utils/grab-join-fields-from-query-object.ts @@ -20,6 +20,7 @@ export default function grabJoinFieldsFromQueryObject< if (new_query.join) { for (let i = 0; i < new_query.join.length; i++) { const join = new_query.join[i]; + if (!join) continue; if (Array.isArray(join)) { @@ -53,21 +54,27 @@ function grabSingleJoinData({ const join_select_fields = join?.selectFields; - if (join_select_fields) { + if (join_select_fields?.[0]) { for (let i = 0; i < join_select_fields.length; i++) { const select_field = join_select_fields[i]; if (select_field) { - const value = join.match; values.push({ + table: join.tableName, field: typeof select_field == "object" ? String(select_field.field) : String(select_field), - table: join.tableName, }); } } } + if (join.group_concat) { + values.push({ + table: join.tableName, + field: join.group_concat.field, + }); + } + return values; }