Merge branch 'master' into preview

Testing new compiler features
2020-04-30 17:02:14 +02:00 · 2020-04-30 17:00:54 +02:00
3 changed files with 11 additions and 13 deletions
--- a/.env
+++ b/.env
@@ -1 +1,2 @@
-cds.features.snapi = y
+cds.features.snapi = y
+cds.cdsc.beta.aspectCompositions = true
--- a/orders/db/data/sap.capire.bookshop-Orders.Items.csv
+++ b/orders/db/data/sap.capire.bookshop-Orders.Items.csv
@@ -1,4 +1,4 @@
-ID;amount;parent_ID;book_ID;netAmount
-58040e66-1dcd-4ffb-ab10-fdce32028b79;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;201;11.11
-64e718c9-ff99-47f1-8ca3-950c850777d4;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;271;15
-e9641166-e050-4261-bfee-d1e797e6cb7f;2;64e718c9-ff99-47f1-8ca3-950c850777d4;252;28
+ID;amount;parent_ID;book_ID
+58040e66-1dcd-4ffb-ab10-fdce32028b79;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;201
+64e718c9-ff99-47f1-8ca3-950c850777d4;1;7e2f2640-6866-4dcf-8f4d-3027aa831cad;271
+e9641166-e050-4261-bfee-d1e797e6cb7f;2;64e718c9-ff99-47f1-8ca3-950c850777d4;252
--- a/orders/db/schema.cds
+++ b/orders/db/schema.cds
@@ -4,13 +4,10 @@ namespace sap.capire.bookshop;

 entity Orders : cuid, managed {
  OrderNo  : String @title:'Order Number'; //> readable key
-  Items    : Composition of many OrderItems on Items.parent = $self;
+  Items    : Composition of many {
+    key pos : Integer;
+    book    : Association to Books;
+    amount  : Integer;
+  };
  currency : Currency;
 }
-
-entity OrderItems : cuid {
-  parent    : Association to Orders;
-  book      : Association to Books;
-  amount    : Integer;
-  netAmount : Decimal(9,2);
-}
Author	SHA1	Message	Date
Daniel	a9af7b242d	Merge branch 'master' into preview	2020-04-30 17:02:14 +02:00
Daniel	8a55c2e68b	Testing new compiler features	2020-04-30 17:00:54 +02:00