orchid-orm 1.10.4 → 1.10.6

package/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/dist/index.d.ts

@@ -224,7 +224,7 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
                 (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawExpression;
                 (sql: string): orchid_core.RawExpression;
                 (values: Record<string, unknown>, sql: string): orchid_core.RawExpression;
-                (values: Record<string, unknown>): (sql_0: TemplateStringsArray, ...sql_1: unknown[]) => orchid_core.RawExpression;
+                (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawExpression;
             };
             smallint(): pqb.SmallIntColumn;
             integer(): pqb.IntegerColumn;
@@ -375,7 +375,7 @@ declare const createBaseTable: <CT extends Record<string, orchid_core.AnyColumnT
                 (sql: TemplateStringsArray, ...values: unknown[]): orchid_core.RawExpression;
                 (sql: string): orchid_core.RawExpression;
                 (values: Record<string, unknown>, sql: string): orchid_core.RawExpression;
-                (values: Record<string, unknown>): (sql_0: TemplateStringsArray, ...sql_1: unknown[]) => orchid_core.RawExpression;
+                (values: Record<string, unknown>): (strings: TemplateStringsArray, ...values: unknown[]) => orchid_core.RawExpression;
             };
             smallint(): pqb.SmallIntColumn;
             integer(): pqb.IntegerColumn;

package/dist/index.js

@@ -163,7 +163,7 @@ const makeBelongsToMethod = (relation, relationName, query) => {
   return {
     returns: "one",
     method: (params) => {
-      return query.findBy({ [primaryKey]: params[foreignKey] });
+      return query.where({ [primaryKey]: params[foreignKey] });
     },
     virtualColumn: new BelongsToVirtualColumn(relationName, state),
     joinQuery(fromQuery, toQuery) {
@@ -397,11 +397,6 @@ class HasOneVirtualColumn extends pqb.VirtualColumn {
   }
 }
 const makeHasOneMethod = (table, relation, relationName, query) => {
-  if (relation.options.required) {
-    query._take();
-  } else {
-    query._takeOptional();
-  }
   if ("through" in relation.options) {
     const { through, source } = relation.options;
     const throughRelation = getThroughRelation(table, through);
@@ -1265,7 +1260,11 @@ const applyRelation = (qb, { relationName, relation, dbTable, otherDbTable }, de
     throw new Error(`Unknown relation type ${type}`);
   }
   if (data.returns === "one") {
-    query._take();
+    if (relation.options.required) {
+      query._take();
+    } else {
+      query._takeOptional();
+    }
     query.query.returnsOne = true;
   }
   if (data.virtualColumn) {