orchid-orm 1.23.10 → 1.24.0

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Query, SelectableFromShape, CreateMethodsNames, AddQueryDefaults, SetQueryReturnsOne, SetQueryReturnsOneOptional, RelationJoinQuery, UpdateData, WhereArg, CreateData, JoinQueryMethod, DeleteMethodsNames, Db, IsolationLevel, TransactionOptions, Adapter, FromArg, FromArgOptions, FromResult, AdapterOptions, QueryLogOptions, NoPrimaryKeyOption, RelationQuery, MapTableScopesOption, ComputedColumnsBase, QueryData, QueryBase, DbTableOptionScopes, DefaultSchemaConfig, DefaultColumnTypes, RelationQueryBase, QueryBeforeHook, QueryAfterHook, AfterHook, WhereResult, MergeQuery } from 'pqb';
 export * from 'pqb';
 import { ColumnsShapeBase, EmptyObject, MaybeArray, RecordUnknown, CoreQueryScopes, ColumnShapeOutput, ColumnShapeInput, ColumnShapeInputPartial, ColumnSchemaConfig, QueryReturnType } from 'orchid-core';
+export * from 'orchid-core';
 
 interface RelationCommonOptions<Related extends TableClass = TableClass, Scope extends Query = Query> {
     scope?: ScopeFn<Related, Scope>;

package/dist/index.js

@@ -1035,7 +1035,7 @@ const nestedUpdate$1 = ({ query, primaryKeys, foreignKeys }) => {
         ),
         obj
       );
-      if (params.set) {
+      if (params.set && (Array.isArray(params.set) ? params.set.length : orchidCore.objectHasValues(params.set))) {
         delete t.q[pqb.toSQLCacheKey];
         const obj2 = {};
         for (let i = 0; i < len; i++) {
@@ -1144,10 +1144,17 @@ const makeHasAndBelongsToManyMethod = (table, qb, relation, relationName, query)
     throughForeignKeys = [options.associationForeignKey];
     throughPrimaryKeys = [options.associationPrimaryKey];
   }
-  const foreignKeysFull = foreignKeys.map((key) => `${joinTable}.${key}`);
-  const throughForeignKeysFull = throughForeignKeys.map(
-    (key) => `${joinTable}.${key}`
-  );
+  const { snakeCase } = table.internal;
+  const foreignKeysFull = foreignKeys.map((key, i) => {
+    if (snakeCase)
+      key = foreignKeys[i] = orchidCore.toSnakeCase(key);
+    return `${joinTable}.${key}`;
+  });
+  const throughForeignKeysFull = throughForeignKeys.map((key, i) => {
+    if (snakeCase)
+      key = throughForeignKeys[i] = orchidCore.toSnakeCase(key);
+    return `${joinTable}.${key}`;
+  });
   const foreignTable = pqb.getQueryAs(query);
   const throughPrimaryKeysFull = throughPrimaryKeys.map(
     (key) => `${foreignTable}.${key}`
@@ -1533,15 +1540,17 @@ const nestedUpdate = (state) => {
       const j = queryJoinTable(state, data);
       await pqb._queryDelete(j);
       delete j.q[pqb.toSQLCacheKey];
-      const idsRows = await pqb._queryRows(
-        pqb._querySelect(
-          state.relatedTableQuery.where(
-            conditionsToWhereArg(params.set)
-          ),
-          state.throughPrimaryKeys
-        )
-      );
-      await insertToJoinTable(state, j, data, idsRows);
+      if (Array.isArray(params.set) ? params.set.length : orchidCore.objectHasValues(params.set)) {
+        const idsRows = await pqb._queryRows(
+          pqb._querySelect(
+            state.relatedTableQuery.where(
+              conditionsToWhereArg(params.set)
+            ),
+            state.throughPrimaryKeys
+          )
+        );
+        await insertToJoinTable(state, j, data, idsRows);
+      }
     }
   };
 };
@@ -1858,7 +1867,8 @@ const orchidORM = (_a, tables) => {
       schema: table.schema,
       language: table.language,
       scopes: table.scopes,
-      softDelete: table.softDelete
+      softDelete: table.softDelete,
+      snakeCase: table.snakeCase
     });
     if (table.noPrimaryKey)
       options2.noPrimaryKey = "ignore";
@@ -1947,4 +1957,10 @@ Object.keys(pqb).forEach(function (k) {
     get: function () { return pqb[k]; }
   });
 });
+Object.keys(orchidCore).forEach(function (k) {
+  if (k !== 'default' && !exports.hasOwnProperty(k)) Object.defineProperty(exports, k, {
+    enumerable: true,
+    get: function () { return orchidCore[k]; }
+  });
+});
 //# sourceMappingURL=index.js.map