]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
don't use LABEL_STYLE_TABLENAME_PLUS_COL on _load_on_ident
authorInada Naoki <songofacandy@gmail.com>
Tue, 21 Oct 2025 11:24:06 +0000 (20:24 +0900)
committerInada Naoki <songofacandy@gmail.com>
Tue, 21 Oct 2025 11:24:06 +0000 (20:24 +0900)
13 files changed:
doc/build/orm/queryguide/columns.rst
doc/build/orm/queryguide/inheritance.rst
doc/build/orm/quickstart.rst
doc/build/tutorial/orm_data_manipulation.rst
doc/build/tutorial/orm_related_objects.rst
lib/sqlalchemy/orm/loading.py
test/orm/dml/test_update_delete_where.py
test/orm/inheritance/test_basic.py
test/orm/test_defaults.py
test/orm/test_deferred.py
test/orm/test_dynamic.py
test/orm/test_merge.py
test/orm/test_unitofworkv2.py

index ace6a63f4ce362ea2a982a0c2d351ad3fb79e846..4b1947fd1f486f53b5f09c971b831de7ef147c15 100644 (file)
@@ -87,7 +87,7 @@ order to load the value.  Below, accessing ``.cover_photo`` emits a SELECT
 statement to load its value::
 
     >>> img_data = books[0].cover_photo
-    {execsql}SELECT book.cover_photo AS book_cover_photo
+    {execsql}SELECT book.cover_photo
     FROM book
     WHERE book.id = ?
     [...] (1,)
@@ -223,7 +223,7 @@ As is the case with :func:`_orm.load_only`, unloaded columns by default
 will load themselves when accessed using :term:`lazy loading`::
 
     >>> img_data = books[0].cover_photo
-    {execsql}SELECT book.cover_photo AS book_cover_photo
+    {execsql}SELECT book.cover_photo
     FROM book
     WHERE book.id = ?
     [...] (4,)
@@ -354,7 +354,7 @@ on the loaded object are first accessed is that they will :term:`lazy load`
 their value::
 
     >>> img_data = book.cover_photo
-    {execsql}SELECT book.cover_photo AS book_cover_photo
+    {execsql}SELECT book.cover_photo
     FROM book
     WHERE book.id = ?
     [...] (2,)
@@ -510,7 +510,7 @@ will load both columns at once using just one SELECT statement::
     WHERE book.id = ?
     [...] (2,)
     {stop}>>> img_data, summary = book.cover_photo, book.summary
-    {execsql}SELECT book.summary AS book_summary, book.cover_photo AS book_cover_photo
+    {execsql}SELECT book.summary, book.cover_photo
     FROM book
     WHERE book.id = ?
     [...] (2,)
index 537d51ae59e60026c4133e7f2ba4066598ab048e..7f948ded97ca23012835430456cc15fafe547e7d 100644 (file)
@@ -954,7 +954,7 @@ when it's accessed::
     WHERE employee.name = ?
     [...] ('Mr. Krabs',)
     {stop}>>> mr_krabs.manager_name
-    {execsql}SELECT employee.manager_name AS employee_manager_name
+    {execsql}SELECT employee.manager_name
     FROM employee
     WHERE employee.id = ? AND employee.type IN (?)
     [...] (1, 'manager')
index e8d4a2623391e67255e833f76773f22cc9b47d4e..39f59b9e0e069a89b1e5b480e1d2a40f44fdf136 100644 (file)
@@ -380,7 +380,7 @@ object by primary key using :meth:`_orm.Session.get`, then work with the object:
 
     >>> sandy = session.get(User, 2)
     {execsql}BEGIN (implicit)
-    SELECT user_account.id AS user_account_id, user_account.name AS user_account_name, user_account.fullname AS user_account_fullname
+    SELECT user_account.id, user_account.name, user_account.fullname
     FROM user_account
     WHERE user_account.id = ?
     [...] (2,){stop}
@@ -416,7 +416,7 @@ options that we configured, in this case, onto the related ``Address`` objects:
 .. sourcecode:: pycon+sql
 
     >>> session.delete(patrick)
-    {execsql}SELECT user_account.id AS user_account_id, user_account.name AS user_account_name, user_account.fullname AS user_account_fullname
+    {execsql}SELECT user_account.id, user_account.name, user_account.fullname
     FROM user_account
     WHERE user_account.id = ?
     [...] (3,)
index 5250fbcd0b34d3f96f86ddd79231a2a680aa921d..c555e4d10856f9355e1b65e26564bcbabacec8f8 100644 (file)
@@ -464,8 +464,7 @@ a new transaction and refresh ``sandy`` with the current database row:
 
     >>> sandy.fullname
     {execsql}BEGIN (implicit)
-    SELECT user_account.id AS user_account_id, user_account.name AS user_account_name,
-    user_account.fullname AS user_account_fullname
+    SELECT user_account.id, user_account.name, user_account.fullname
     FROM user_account
     WHERE user_account.id = ?
     [...] (2,){stop}
@@ -547,7 +546,7 @@ a context manager as well, accomplishes the following things:
       >>> session.add(squidward)
       >>> squidward.name
       {execsql}BEGIN (implicit)
-      SELECT user_account.id AS user_account_id, user_account.name AS user_account_name, user_account.fullname AS user_account_fullname
+      SELECT user_account.id, user_account.name, user_account.fullname
       FROM user_account
       WHERE user_account.id = ?
       [...] (4,){stop}
index 48e049dd9e815a3a571d2c06e8ccd7e92e1577b4..a08b0fb688fc26019866509eab55fc7387ab3233 100644 (file)
@@ -227,8 +227,7 @@ newly generated primary key for the ``u1`` object:
 
   >>> u1.id
   {execsql}BEGIN (implicit)
-  SELECT user_account.id AS user_account_id, user_account.name AS user_account_name,
-  user_account.fullname AS user_account_fullname
+  SELECT user_account.id, user_account.name, user_account.fullname
   FROM user_account
   WHERE user_account.id = ?
   [...] (6,){stop}
index f1d90f8d8728c5772d3510498bc4c01314b3b805..9f78711e5771318b43fc16abc470a0c47dec5724 100644 (file)
@@ -51,7 +51,6 @@ from ..engine.result import SimpleResultMetaData
 from ..sql import select
 from ..sql import util as sql_util
 from ..sql.selectable import ForUpdateArg
-from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL
 from ..sql.selectable import SelectState
 from ..util import EMPTY_DICT
 from ..util.typing import TupleAny
@@ -1671,7 +1670,7 @@ def _load_scalar_attributes(mapper, state, attribute_names, passive):
 
     result = _load_on_ident(
         session,
-        select(mapper).set_label_style(LABEL_STYLE_TABLENAME_PLUS_COL),
+        select(mapper),
         identity_key,
         refresh_state=state,
         only_load_props=attribute_names,
index 05e02a659715de6fbf87a1dfd002f17bac3eab1e..3463fae9079fcbab076e4ad3cba36a3ebd898eeb 100644 (file)
@@ -567,15 +567,15 @@ class UpdateDeleteTest(fixtures.MappedTest):
         to_assert = [
             # refresh john
             CompiledSQL(
-                "SELECT users.id AS users_id, users.name AS users_name, "
-                "users.age_int AS users_age_int FROM users "
+                "SELECT users.id, users.name, users.age_int "
+                "FROM users "
                 "WHERE users.id = :pk_1",
                 [{"pk_1": 1}],
             ),
             # refresh jill
             CompiledSQL(
-                "SELECT users.id AS users_id, users.name AS users_name, "
-                "users.age_int AS users_age_int FROM users "
+                "SELECT users.id, users.name, users.age_int "
+                "FROM users "
                 "WHERE users.id = :pk_1",
                 [{"pk_1": 3}],
             ),
@@ -585,8 +585,8 @@ class UpdateDeleteTest(fixtures.MappedTest):
             to_assert.append(
                 # refresh jane for partial attributes
                 CompiledSQL(
-                    "SELECT users.name AS users_name, "
-                    "users.age_int AS users_age_int FROM users "
+                    "SELECT users.name, users.age_int "
+                    "FROM users "
                     "WHERE users.id = :pk_1",
                     [{"pk_1": 4}],
                 )
@@ -711,15 +711,15 @@ class UpdateDeleteTest(fixtures.MappedTest):
         asserter.assert_(
             # refresh john
             CompiledSQL(
-                "SELECT users.id AS users_id, users.name AS users_name, "
-                "users.age_int AS users_age_int FROM users "
+                "SELECT users.id, users.name, users.age_int "
+                "FROM users "
                 "WHERE users.id = :pk_1",
                 [{"pk_1": 1}],
             ),
             # refresh jill
             CompiledSQL(
-                "SELECT users.id AS users_id, users.name AS users_name, "
-                "users.age_int AS users_age_int FROM users "
+                "SELECT users.id, users.name, users.age_int "
+                "FROM users "
                 "WHERE users.id = :pk_1",
                 [{"pk_1": 3}],
             ),
index 9028fd25a43012397fe1e6afb7315f48f94f9a7a..93cf55da30f6557af312adfb090dc73d5b6fe561 100644 (file)
@@ -2875,11 +2875,9 @@ class OptimizedLoadTest(fixtures.MappedTest):
             testing.db,
             go,
             CompiledSQL(
-                "SELECT base.id AS base_id, sub.id AS sub_id, "
-                "base.data AS base_data, base.type AS base_type, "
-                "base.counter AS base_counter, "
-                "sub.subcounter AS sub_subcounter, "
-                "sub.sub AS sub_sub, sub.subcounter2 AS sub_subcounter2 "
+                "SELECT base.id, sub.id AS id_1, "
+                "base.data, base.type, base.counter, "
+                "sub.subcounter, sub.sub, sub.subcounter2 "
                 "FROM base LEFT OUTER JOIN sub ON base.id = sub.id "
                 "WHERE base.id = :pk_1",
                 {"pk_1": sjb_id},
@@ -3246,9 +3244,8 @@ class OptimizedLoadTest(fixtures.MappedTest):
                 not eager_defaults and not expect_returning,
                 [
                     CompiledSQL(
-                        "SELECT base.counter AS base_counter, "
-                        "sub.subcounter AS sub_subcounter, sub.subcounter2 "
-                        "AS sub_subcounter2 FROM base "
+                        "SELECT base.counter, sub.subcounter, sub.subcounter2 "
+                        "FROM base "
                         "JOIN sub ON base.id = sub.id WHERE base.id = :pk_1",
                         lambda ctx: {"pk_1": s1.id},
                     )
index d230d4aafc0658af77ff826f8d0071d9f5888ced..09adee59c6b01cdabfe4ecb45a4e32f786cb662c 100644 (file)
@@ -319,12 +319,12 @@ class ComputedDefaultsOnUpdateTest(fixtures.MappedTest):
                         [{"foo": 5, "id": 1}, {"foo": 10, "id": 2}],
                     ),
                     CompiledSQL(
-                        "SELECT test.bar AS test_bar FROM test "
+                        "SELECT test.bar FROM test "
                         "WHERE test.id = :pk_1",
                         [{"pk_1": 1}],
                     ),
                     CompiledSQL(
-                        "SELECT test.bar AS test_bar FROM test "
+                        "SELECT test.bar FROM test "
                         "WHERE test.id = :pk_1",
                         [{"pk_1": 2}],
                     ),
@@ -409,12 +409,12 @@ class ComputedDefaultsOnUpdateTest(fixtures.MappedTest):
                     [{"foo": 5, "test_id": 1}, {"foo": 6, "test_id": 2}],
                 ),
                 CompiledSQL(
-                    "SELECT test.bar AS test_bar FROM test "
+                    "SELECT test.bar FROM test "
                     "WHERE test.id = :pk_1",
                     [{"pk_1": 1}],
                 ),
                 CompiledSQL(
-                    "SELECT test.bar AS test_bar FROM test "
+                    "SELECT test.bar FROM test "
                     "WHERE test.id = :pk_1",
                     [{"pk_1": 2}],
                 ),
index dbfe3ef7974d21df7aaffa04e81fb30ce44fabba..1361ae488dd7549c3a1aa5b5fc5e60f58ed8b50f 100644 (file)
@@ -90,7 +90,7 @@ class DeferredTest(AssertsCompiledSQL, _fixtures.FixtureTest):
                     {},
                 ),
                 (
-                    "SELECT orders.description AS orders_description "
+                    "SELECT orders.description "
                     "FROM orders WHERE orders.id = :pk_1",
                     {"pk_1": 3},
                 ),
@@ -131,7 +131,7 @@ class DeferredTest(AssertsCompiledSQL, _fixtures.FixtureTest):
                     {},
                 ),
                 (
-                    "SELECT orders.description AS orders_description "
+                    "SELECT orders.description "
                     "FROM orders WHERE orders.id = :pk_1",
                     {"pk_1": 3},
                 ),
@@ -383,10 +383,10 @@ class DeferredTest(AssertsCompiledSQL, _fixtures.FixtureTest):
                     {},
                 ),
                 (
-                    "SELECT orders.user_id AS orders_user_id, "
-                    "orders.address_id AS orders_address_id, "
-                    "orders.description AS orders_description, "
-                    "orders.isopen AS orders_isopen "
+                    "SELECT orders.user_id, "
+                    "orders.address_id, "
+                    "orders.description, "
+                    "orders.isopen "
                     "FROM orders WHERE orders.id = :pk_1",
                     {"pk_1": 3},
                 ),
@@ -516,7 +516,7 @@ class DeferredOptionsTest(AssertsCompiledSQL, _fixtures.FixtureTest):
                     {},
                 ),
                 (
-                    "SELECT orders.user_id AS orders_user_id "
+                    "SELECT orders.user_id "
                     "FROM orders WHERE orders.id = :pk_1",
                     {"pk_1": 1},
                 ),
index 9378f1ef50c909480507408a13b1addf3240bb7e..9c69c10db29858b0eb909df888dacdeb95b57326 100644 (file)
@@ -1127,7 +1127,7 @@ class _UOWTests:
             testing.db,
             sess.flush,
             CompiledSQL(
-                "SELECT users.id AS users_id, users.name AS users_name "
+                "SELECT users.id, users.name "
                 "FROM users WHERE users.id = :pk_1",
                 lambda ctx: [{"pk_1": u1_id}],
             ),
@@ -1160,8 +1160,8 @@ class _UOWTests:
             testing.db,
             sess.flush,
             CompiledSQL(
-                "SELECT addresses.id AS addresses_id, addresses.email_address "
-                "AS addresses_email_address FROM addresses "
+                "SELECT addresses.id, addresses.email_address "
+                "FROM addresses "
                 "WHERE addresses.id = :pk_1",
                 lambda ctx: [{"pk_1": a2_id}],
             ),
@@ -1171,7 +1171,7 @@ class _UOWTests:
                 lambda ctx: [{"addresses_id": a2_id, "user_id": None}],
             ),
             CompiledSQL(
-                "SELECT users.id AS users_id, users.name AS users_name "
+                "SELECT users.id, users.name "
                 "FROM users WHERE users.id = :pk_1",
                 lambda ctx: [{"pk_1": u1_id}],
             ),
index 9fb16a2ce1bc9762e2cd09585ca068f2a834c291..bec6c4236ab2749adc48f1ecb1db9843d646dde5 100644 (file)
@@ -2048,12 +2048,12 @@ class DeferredMergeTest(fixtures.MappedTest):
             go,
             [
                 (
-                    "SELECT book.summary AS book_summary "
+                    "SELECT book.summary "
                     "FROM book WHERE book.id = :pk_1",
                     {"pk_1": 1},
                 ),
                 (
-                    "SELECT book.excerpt AS book_excerpt "
+                    "SELECT book.excerpt "
                     "FROM book WHERE book.id = :pk_1",
                     {"pk_1": 1},
                 ),
@@ -2094,12 +2094,12 @@ class DeferredMergeTest(fixtures.MappedTest):
             go,
             [
                 (
-                    "SELECT book.summary AS book_summary "
+                    "SELECT book.summary "
                     "FROM book WHERE book.id = :pk_1",
                     {"pk_1": 1},
                 ),
                 (
-                    "SELECT book.excerpt AS book_excerpt "
+                    "SELECT book.excerpt "
                     "FROM book WHERE book.id = :pk_1",
                     {"pk_1": 1},
                 ),
index 90ea0eaa039ec86680174e71fbaaf98fc1edc4ef..0a99bca9620c61a27dbc4191bdda7249d765ec18 100644 (file)
@@ -381,25 +381,21 @@ class RudimentaryFlushTest(UOWTest):
                 # the User row might be handled before or the addresses
                 # are loaded so need to use AllOf
                 CompiledSQL(
-                    "SELECT addresses.id AS addresses_id, "
-                    "addresses.user_id AS "
-                    "addresses_user_id, addresses.email_address AS "
-                    "addresses_email_address FROM addresses "
+                    "SELECT addresses.id, addresses.user_id, addresses.email_address "
+                    "FROM addresses "
                     "WHERE addresses.id = "
                     ":pk_1",
                     lambda ctx: {"pk_1": c1id},
                 ),
                 CompiledSQL(
-                    "SELECT addresses.id AS addresses_id, "
-                    "addresses.user_id AS "
-                    "addresses_user_id, addresses.email_address AS "
-                    "addresses_email_address FROM addresses "
+                    "SELECT addresses.id, addresses.user_id, addresses.email_address "
+                    "FROM addresses "
                     "WHERE addresses.id = "
                     ":pk_1",
                     lambda ctx: {"pk_1": c2id},
                 ),
                 CompiledSQL(
-                    "SELECT users.id AS users_id, users.name AS users_name "
+                    "SELECT users.id, users.name "
                     "FROM users WHERE users.id = :pk_1",
                     lambda ctx: {"pk_1": pid},
                 ),
@@ -457,19 +453,15 @@ class RudimentaryFlushTest(UOWTest):
                 # relationship is simple m2o, no SELECT should be emitted for
                 # it.
                 CompiledSQL(
-                    "SELECT addresses.id AS addresses_id, "
-                    "addresses.user_id AS "
-                    "addresses_user_id, addresses.email_address AS "
-                    "addresses_email_address FROM addresses "
+                    "SELECT addresses.id, addresses.user_id, addresses.email_address "
+                    "FROM addresses "
                     "WHERE addresses.id = "
                     ":pk_1",
                     lambda ctx: {"pk_1": c1id},
                 ),
                 CompiledSQL(
-                    "SELECT addresses.id AS addresses_id, "
-                    "addresses.user_id AS "
-                    "addresses_user_id, addresses.email_address AS "
-                    "addresses_email_address FROM addresses "
+                    "SELECT addresses.id, addresses.user_id, addresses.email_address "
+                    "FROM addresses "
                     "WHERE addresses.id = "
                     ":pk_1",
                     lambda ctx: {"pk_1": c2id},
@@ -523,19 +515,15 @@ class RudimentaryFlushTest(UOWTest):
             AllOf(
                 # the parent User is expired, so it gets loaded here.
                 CompiledSQL(
-                    "SELECT addresses.id AS addresses_id, "
-                    "addresses.user_id AS "
-                    "addresses_user_id, addresses.email_address AS "
-                    "addresses_email_address FROM addresses "
+                    "SELECT addresses.id, addresses.user_id, addresses.email_address "
+                    "FROM addresses "
                     "WHERE addresses.id = "
                     ":pk_1",
                     lambda ctx: {"pk_1": c1id},
                 ),
                 CompiledSQL(
-                    "SELECT addresses.id AS addresses_id, "
-                    "addresses.user_id AS "
-                    "addresses_user_id, addresses.email_address AS "
-                    "addresses_email_address FROM addresses "
+                    "SELECT addresses.id, addresses.user_id, addresses.email_address "
+                    "FROM addresses "
                     "WHERE addresses.id = "
                     ":pk_1",
                     lambda ctx: {"pk_1": c2id},
@@ -1313,23 +1301,20 @@ class SingleCycleTest(UOWTest):
                 # the selects here are in fact unexpiring
                 # each row - the m2o comes from the identity map.
                 CompiledSQL(
-                    "SELECT nodes.id AS nodes_id, nodes.parent_id AS "
-                    "nodes_parent_id, "
-                    "nodes.data AS nodes_data FROM nodes "
+                    "SELECT nodes.id, nodes.parent_id, nodes.data "
+                    "FROM nodes "
                     "WHERE nodes.id = :pk_1",
                     lambda ctx: {"pk_1": pid},
                 ),
                 CompiledSQL(
-                    "SELECT nodes.id AS nodes_id, nodes.parent_id AS "
-                    "nodes_parent_id, "
-                    "nodes.data AS nodes_data FROM nodes "
+                    "SELECT nodes.id, nodes.parent_id, nodes.data "
+                    "FROM nodes "
                     "WHERE nodes.id = :pk_1",
                     lambda ctx: {"pk_1": c1id},
                 ),
                 CompiledSQL(
-                    "SELECT nodes.id AS nodes_id, nodes.parent_id AS "
-                    "nodes_parent_id, "
-                    "nodes.data AS nodes_data FROM nodes "
+                    "SELECT nodes.id, nodes.parent_id, nodes.data "
+                    "FROM nodes "
                     "WHERE nodes.id = :pk_1",
                     lambda ctx: {"pk_1": c2id},
                 ),