Merge "Don't use private API to get query criteria"8.6.0

1 files changed, 3 insertions, 4 deletions

diff --git a/oslo_db/sqlalchemy/update_match.py b/oslo_db/sqlalchemy/update_match.py
index 8e139e9..577fb81 100644
--- a/oslo_db/sqlalchemy/update_match.py
+++ b/oslo_db/sqlalchemy/update_match.py
@@ -484,11 +484,10 @@ def _update_stmt_from_query(mapper, query, values):
             mapper.column_attrs[key], value
         ) for key, value in values.items()
     )
-    query = query.enable_eagerloads(False)
-    context = query._compile_context()
-    primary_table = context.statement.froms[0]
+    primary_table = inspect(query.column_descriptions[0]['entity']).local_table
+    where_criteria = query.whereclause
     update_stmt = sql.update(primary_table,
-                             context.whereclause,
+                             where_criteria,
                              upd_values)
     return update_stmt