orange-orm 5.2.0-beta.0 → 5.2.0

package/README.md

@@ -634,8 +634,6 @@ The following operators are supported:
 - max  
 - avg  
 
-For distinct rows across selected fields, you can use `table.distinct(...)`.
-
 You can also elevate associated data to a parent level for easier access. In the example below, <i>balance</i> of the customer is elevated to the root level.
 
 ```javascript
@@ -653,19 +651,6 @@ async function getRows() {
 }
 ```
 
-```javascript
-import map from './map';
-const db = map.sqlite('demo.db');
-
-getDistinct();
-
-async function getDistinct() {
-  const rows = await db.orderLine.distinct({
-    orderId: x => x.orderId
-  });
-}
-```
-
 __Many rows filtered__
 
 ```javascript
@@ -1806,6 +1791,21 @@ async function getRows() {
   });  
 }
 ```
+__Count__  
+Use <i>count</i> on a relation in a filter to compare how many related rows match a condition.
+```javascript
+import map from './map';
+const db = map.sqlite('demo.db');
+
+getRows();
+
+async function getRows() {
+  const rows = await db.order.getMany({
+    where: x => x.lines.count().le(1)
+      .and(x.lines.count(line => line.product.contains('guitar')).eq(1))
+  });
+}
+```
 
 </details>
 
@@ -2315,24 +2315,6 @@ async function getAggregates() {
 }
 ```
 
-__Distinct__  
-Use `distinct` when you want unique combinations of selected fields.
-When only plain columns are selected, this uses SQL `DISTINCT`.
-If aggregate expressions are included, it falls back to `GROUP BY`.
-
-```javascript
-import map from './map';
-const db = map.sqlite('demo.db');
-
-getDistinctRows();
-
-async function getDistinctRows() {
-  const rows = await db.orderLine.distinct({
-    orderId: x => x.orderId
-  });
-}
-```
-
 __Count__  
 For convenience, you can use the <i>count</i> directly on the table instead of using the aggregated query syntax.
 ```javascript

package/docs/changelog.md

@@ -1,4 +1,8 @@
 ## Changelog
+__5.2.0__  
+Distinct aggregates via `distinct()` [#119](https://github.com/alfateam/orange-orm/issues/119)  
+Column-to-column filters (incl. `contains`, `startsWith`, `endsWith`) [#150](htps://github.com/alfateam/orange-orm/issues/150)  
+Relation count filters: `x.lines.count()` with optional predicate [#151](htps://github.com/alfateam/orange-orm/issues/151)  
 __5.1.0__  
 Support for Hono [#149](https://github.com/alfateam/orange-orm/issues/149)  
 Removed dependency `glob`  

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.2.0-beta.0",
+    "version": "5.2.0",
     "publishConfig": {
         "access": "public"
     },