Merge branch 'odata'

Author: ako

mdl-examples/doctype-tests/10-odata-examples.mdl

@@ -372,53 +372,67 @@ SHOW EXTERNAL ACTIONS IN OdTest;
 -- ############################################################################
 -- LEVEL 10: CREATE EXTERNAL ENTITIES (bulk from contract)
 -- ############################################################################
+--
+-- Bulk-creates external entities from the TripPin RW OData service.
+-- Validates mendixlabs/mxcli#143: key, attribute OData mapping, and
+-- capability annotations are all written correctly to BSON.
+--
+-- Requires network access to services.odata.org (public, no auth).
+-- CREATE ODATA CLIENT fetches and caches $metadata automatically.
+--
+-- ############################################################################
 
-/*
- * Level 10.1: Create all external entities from a consumed OData service.
- * Reads the service's cached $metadata and creates one external entity
- * per entity type in the domain model.
- * Prerequisite: The OData client must have cached metadata (fetched during CREATE).
- *
- * CREATE EXTERNAL ENTITIES FROM OdTest.SalesforceAPI;
+/**
+ * Level 10.0: Set up the TripPin module, role, and constant.
  */
+CREATE MODULE TripPinClient;
+/
 
-/*
- * Level 10.2: Create external entities into a different module.
- * By default entities are created in the same module as the service.
- * Use INTO to redirect them.
- *
- * CREATE EXTERNAL ENTITIES FROM OdTest.SalesforceAPI INTO Integration;
- */
+CREATE MODULE ROLE TripPinClient."User"
+  DESCRIPTION 'Role for TripPin API access';
+/
 
-/*
- * Level 10.3: Create only specific external entities by name.
- * Use the ENTITIES clause to filter which entity types to create.
- *
- * CREATE EXTERNAL ENTITIES FROM OdTest.SalesforceAPI ENTITIES (Account, Contact);
- */
+CREATE CONSTANT TripPinClient."TripPinServiceUrl"
+  TYPE String
+  DEFAULT 'https://services.odata.org/TripPinRESTierService/';
+/
 
-/*
- * Level 10.4: Idempotent bulk create — updates existing entities.
- *
- * CREATE OR MODIFY EXTERNAL ENTITIES FROM OdTest.SalesforceAPI;
+/**
+ * Level 10.1: Register the TripPin RW service.
+ * CREATE ODATA CLIENT fetches and caches $metadata from MetadataUrl.
+ * ServiceUrl must reference a constant (CE6825).
  */
+CREATE ODATA CLIENT TripPinClient."TripPinApiClient" (
+  ODataVersion: OData4,
+  MetadataUrl: 'https://services.odata.org/TripPinRESTierService/$metadata',
+  Timeout: 300,
+  ServiceUrl: @TripPinClient.TripPinServiceUrl,
+  UseAuthentication: No
+);
+/
 
-/*
- * Level 10.5: Combine INTO, ENTITIES filter, and OR MODIFY.
- *
- * CREATE OR MODIFY EXTERNAL ENTITIES FROM OdTest.SalesforceAPI INTO Integration ENTITIES (Account, Contact);
+/**
+ * Level 10.2: Bulk import all entity types from the TripPin contract.
+ * Creates one external entity per OData entity type. Top-level entity
+ * sets (Airlines, Airports, People) use the set name; derived/contained
+ * types (Flight, PlanItem, Trip, etc.) use the type name.
  */
+CREATE EXTERNAL ENTITIES FROM TripPinClient."TripPinApiClient";
+/
 
--- NOTE: These commands require a live OData client with cached $metadata,
--- so they are shown as comments above. The syntax is validated by mxcli check.
+/**
+ * Level 10.3: Import only specific entity types by name.
+ */
+CREATE OR MODIFY EXTERNAL ENTITIES FROM TripPinClient."TripPinApiClient"
+  ENTITIES (Airline, Airport);
+/
 
--- ############################################################################
--- NOTE: CREATE ODATA CLIENT now auto-fetches and caches $metadata from the
--- MetadataUrl. CONTRACT BROWSING commands (SHOW CONTRACT ENTITIES/ACTIONS)
--- work on services with cached metadata. The test URLs above are not reachable
--- from CI, so contract browsing examples are not included here.
--- See cmd/mxcli/help_topics/odata.txt for syntax reference.
--- ############################################################################
+/**
+ * Level 10.4: Import all entities into a different module.
+ */
+CREATE OR MODIFY EXTERNAL ENTITIES FROM TripPinClient."TripPinApiClient"
+  INTO TripPinClient;
+/
 
 -- ############################################################################
 -- LEVEL 8.8: DROP (cleanup)
@@ -443,7 +457,13 @@ DROP ODATA CLIENT OdTest.SalesforceAPI;
 /
 
 /**
- * Level 8.8c: Drop an OData service
+ * Level 8.8c: Drop the TripPin client (cascades to its external entities)
+ */
+DROP ODATA CLIENT TripPinClient."TripPinApiClient";
+/
+
+/**
+ * Level 8.8d: Drop an OData service
  */
 DROP ODATA SERVICE OdTest.CustomerAPI;
 /

mdl/grammar/MDLParser.g4

@@ -2654,6 +2654,7 @@ odataPropertyValue
     | TRUE
     | FALSE
     | MICROFLOW qualifiedName?
+    | AT qualifiedName              // @Module.ConstantName (Mendix constant reference — required for ServiceUrl)
     | qualifiedName
     ;