Skip to content

Commit 9a6dc4e

Browse files
committed
Copilot comments
1 parent 18418c0 commit 9a6dc4e

7 files changed

Lines changed: 28 additions & 30 deletions

File tree

examples/advanced/file_upload.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def ensure_table():
187187
sys.exit(1)
188188

189189
entity_set = table_info.get("entity_set_name")
190-
table_schema_name = table_info.get("entity_schema_name") or entity_set.rstrip("s")
190+
table_schema_name = table_info.get("table_schema_name") or entity_set.rstrip("s")
191191
attr_prefix = table_schema_name.split('_',1)[0] if '_' in table_schema_name else table_schema_name
192192
name_attr = f"{attr_prefix}_name"
193193
small_file_attr_schema = f"{attr_prefix}_SmallDocument" # second file attribute for small single-request demo

examples/advanced/pandas_integration.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ def backoff_retry(op, *, delays=(0, 2, 5, 10, 20), retry_http_statuses=(400, 403
7474
table_info = existing
7575
created_this_run = False
7676
print({
77-
"table": table_info.get("entity_schema"),
77+
"table": table_info.get("table_schema_name"),
7878
"existed": True,
7979
"entity_set": table_info.get("entity_set_name"),
80-
"logical": table_info.get("entity_logical_name"),
80+
"logical": table_info.get("table_logical_name"),
8181
"metadata_id": table_info.get("metadata_id"),
8282
})
8383

@@ -96,10 +96,10 @@ def backoff_retry(op, *, delays=(0, 2, 5, 10, 20), retry_http_statuses=(400, 403
9696
)
9797
created_this_run = True if table_info and table_info.get("columns_created") else False
9898
print({
99-
"table": table_info.get("entity_schema") if table_info else None,
99+
"table": table_info.get("table_schema_name") if table_info else None,
100100
"existed": False,
101101
"entity_set": table_info.get("entity_set_name") if table_info else None,
102-
"logical": table_info.get("entity_logical_name") if table_info else None,
102+
"logical": table_info.get("table_logical_name") if table_info else None,
103103
"metadata_id": table_info.get("metadata_id") if table_info else None,
104104
})
105105
except Exception as e:
@@ -119,7 +119,7 @@ def backoff_retry(op, *, delays=(0, 2, 5, 10, 20), retry_http_statuses=(400, 403
119119
# Fail fast: all operations must use the custom table
120120
sys.exit(1)
121121

122-
logical = table_info.get("entity_logical_name")
122+
logical = table_info.get("table_logical_name")
123123
# Derive attribute logical name prefix from the entity logical name
124124
attr_prefix = logical.split("_", 1)[0] if "_" in logical else logical
125125
record_data = {

examples/advanced/walkthrough.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ def main():
7575
table_info = client.get_table_info(table_name)
7676

7777
if table_info:
78-
print(f"✓ Table already exists: {table_info.get('entity_schema')}")
79-
print(f" Logical Name: {table_info.get('entity_logical_name')}")
78+
print(f"✓ Table already exists: {table_info.get('table_schema_name')}")
79+
print(f" Logical Name: {table_info.get('table_logical_name')}")
8080
print(f" Entity Set: {table_info.get('entity_set_name')}")
8181
else:
8282
log_call(f"client.create_table('{table_name}', schema={{...}})")
@@ -88,7 +88,7 @@ def main():
8888
"new_Priority": Priority
8989
}
9090
table_info = client.create_table(table_name, schema)
91-
print(f"✓ Created table: {table_info.get('entity_schema')}")
91+
print(f"✓ Created table: {table_info.get('table_schema_name')}")
9292
print(f" Columns created: {', '.join(table_info.get('columns_created', []))}")
9393

9494
# ============================================================================

examples/basic/functional_testing.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ def ensure_test_table(client: DataverseClient) -> Dict[str, Any]:
106106
}
107107
)
108108

109-
print(f"✅ Created test table: {table_info.get('entity_schema')}")
110-
print(f" Logical name: {table_info.get('entity_logical_name')}")
109+
print(f"✅ Created test table: {table_info.get('table_schema_name')}")
110+
print(f" Logical name: {table_info.get('table_logical_name')}")
111111
print(f" Entity set: {table_info.get('entity_set_name')}")
112112

113113
# Wait a moment for table to be ready
@@ -124,7 +124,7 @@ def test_create_record(client: DataverseClient, table_info: Dict[str, Any]) -> s
124124
print("\n📝 Record Creation Test")
125125
print("=" * 50)
126126

127-
logical_name = table_info.get("entity_logical_name")
127+
logical_name = table_info.get("table_logical_name")
128128
attr_prefix = logical_name.split("_", 1)[0] if "_" in logical_name else logical_name
129129

130130
# Create test record data
@@ -163,7 +163,7 @@ def test_read_record(client: DataverseClient, table_info: Dict[str, Any], record
163163
print("\n📖 Record Reading Test")
164164
print("=" * 50)
165165

166-
logical_name = table_info.get("entity_logical_name")
166+
logical_name = table_info.get("table_logical_name")
167167
attr_prefix = logical_name.split("_", 1)[0] if "_" in logical_name else logical_name
168168

169169
try:
@@ -198,7 +198,7 @@ def test_query_records(client: DataverseClient, table_info: Dict[str, Any]) -> N
198198
print("\n🔍 Record Query Test")
199199
print("=" * 50)
200200

201-
logical_name = table_info.get("entity_logical_name")
201+
logical_name = table_info.get("table_logical_name")
202202
attr_prefix = logical_name.split("_", 1)[0] if "_" in logical_name else logical_name
203203

204204
try:
@@ -234,7 +234,7 @@ def cleanup_test_data(client: DataverseClient, table_info: Dict[str, Any], recor
234234
print("\n🧹 Cleanup")
235235
print("=" * 50)
236236

237-
logical_name = table_info.get("entity_logical_name")
237+
logical_name = table_info.get("table_logical_name")
238238

239239
# Ask user if they want to clean up
240240
cleanup_choice = input("Do you want to delete the test record? (y/N): ").strip().lower()
@@ -253,7 +253,7 @@ def cleanup_test_data(client: DataverseClient, table_info: Dict[str, Any], recor
253253

254254
if table_cleanup in ['y', 'yes']:
255255
try:
256-
client.delete_table(table_info.get("entity_schema"))
256+
client.delete_table(table_info.get("table_schema_name"))
257257
print("✅ Test table deleted successfully")
258258
except Exception as e:
259259
print(f"⚠️ Failed to delete test table: {e}")

examples/basic/installation_example.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ def show_usage_examples():
226226
227227
# Get table information
228228
info = client.get_table_info("CustomEntity")
229-
print(f"Table: {info['entity_schema']}")
229+
print(f"Table: {info['table_schema_name']}")
230230
231231
# List all tables
232232
tables = client.list_tables()

src/PowerPlatform/Dataverse/client.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -402,8 +402,8 @@ def get_table_info(self, table_schema_name: str) -> Optional[Dict[str, Any]]:
402402
:param table_schema_name: Table schema name (e.g. ``"new_SampleItem"`` or ``"account"``).
403403
:type table_schema_name: str
404404
405-
:return: Dictionary containing table metadata with keys ``entity_schema``,
406-
``entity_logical_name``, ``entity_set_name``, and ``metadata_id``.
405+
:return: Dictionary containing table metadata with keys ``table_schema_name``,
406+
``table_logical_name``, ``entity_set_name``, and ``metadata_id``.
407407
Returns None if the table is not found.
408408
:rtype: dict or None
409409
@@ -412,7 +412,7 @@ def get_table_info(self, table_schema_name: str) -> Optional[Dict[str, Any]]:
412412
413413
info = client.get_table_info("new_SampleItem")
414414
if info:
415-
print(f"Logical name: {info['entity_logical_name']}")
415+
print(f"Logical name: {info['table_logical_name']}")
416416
print(f"Entity set: {info['entity_set_name']}")
417417
"""
418418
return self._get_odata()._get_table_info(table_schema_name)
@@ -454,8 +454,8 @@ class ItemStatus(IntEnum):
454454
from the table's customization prefix value.
455455
:type primary_column_schema_name: str or None
456456
457-
:return: Dictionary containing table metadata including ``entity_schema``,
458-
``entity_set_name``, ``entity_logical_name``, ``metadata_id``, and ``columns_created``.
457+
:return: Dictionary containing table metadata including ``table_schema_name``,
458+
``entity_set_name``, ``table_logical_name``, ``metadata_id``, and ``columns_created``.
459459
:rtype: dict
460460
461461
:raises ~PowerPlatform.Dataverse.core.errors.MetadataError: If table creation fails or the schema is invalid.
@@ -478,7 +478,7 @@ class ItemStatus(IntEnum):
478478
}
479479
480480
result = client.create_table("new_SampleItem", schema)
481-
print(f"Created table: {result['entity_logical_name']}")
481+
print(f"Created table: {result['table_logical_name']}")
482482
print(f"Columns: {result['columns_created']}")
483483
484484
Create a table with a custom primary column name::

src/PowerPlatform/Dataverse/data/odata.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ def _do_request(url: str, *, params: Optional[Dict[str, Any]] = None) -> Dict[st
571571
params["$orderby"] = ",".join(self._lowercase_list(orderby))
572572
if expand:
573573
# Lowercase navigation property names for case-insensitive matching
574-
params["$expand"] = ",".join(self._lowercase_list(expand))
574+
params["$expand"] = ",".join(expand)
575575
if top is not None:
576576
params["$top"] = int(top)
577577

@@ -1175,8 +1175,8 @@ def _get_table_info(self, table_schema_name: str) -> Optional[Dict[str, Any]]:
11751175
if not ent:
11761176
return None
11771177
return {
1178-
"entity_schema": ent.get("SchemaName") or table_schema_name,
1179-
"entity_logical_name": ent.get("LogicalName"),
1178+
"table_schema_name": ent.get("SchemaName") or table_schema_name,
1179+
"table_logical_name": ent.get("LogicalName"),
11801180
"entity_set_name": ent.get("EntitySetName"),
11811181
"metadata_id": ent.get("MetadataId"),
11821182
"columns_created": [],
@@ -1254,8 +1254,8 @@ def _create_table(
12541254
)
12551255

12561256
return {
1257-
"entity_schema": table_schema_name,
1258-
"entity_logical_name": metadata.get("LogicalName"),
1257+
"table_schema_name": table_schema_name,
1258+
"table_logical_name": metadata.get("LogicalName"),
12591259
"entity_set_name": metadata.get("EntitySetName"),
12601260
"metadata_id": metadata.get("MetadataId"),
12611261
"columns_created": created_cols,
@@ -1277,8 +1277,6 @@ def _create_columns(
12771277
subcode=ec.METADATA_TABLE_NOT_FOUND,
12781278
)
12791279

1280-
# Use the actual SchemaName from the entity metadata
1281-
entity_schema = ent.get("SchemaName") or table_schema_name
12821280
metadata_id = ent.get("MetadataId")
12831281
created: List[str] = []
12841282
needs_picklist_flush = False

0 commit comments

Comments
 (0)