:meth:`_sql.GenerativeSelect.apply_labels` with explicit getters and
setters :meth:`_sql.GenerativeSelect.get_label_style` and
:meth:`_sql.GenerativeSelect.set_label_style` to accommodate the three
- supported label styles: :data:`_sql.LABEL_STYLE_DISAMBIGUATE_ONLY`,
- :data:`_sql.LABEL_STYLE_TABLENAME_PLUS_COL`, and
- :data:`_sql.LABEL_STYLE_NONE`.
+ supported label styles:
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_DISAMBIGUATE_ONLY`,
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_TABLENAME_PLUS_COL`, and
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_NONE`.
In addition, for Core and "future style" ORM queries,
``LABEL_STYLE_DISAMBIGUATE_ONLY`` is now the default label style. This
--- /dev/null
+.. change::
+ :tags: usecase, sql
+ :tickets: 12932
+
+ Changed the query style for ORM queries emitted by :meth:`.Session.get` as
+ well as many-to-one lazy load queries to use the default labeling style,
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_DISAMBIGUATE_ONLY`, which normally
+ does not apply labels to columns in a SELECT statement. Previously, the
+ older style :attr:`_sql.SelectLabelStyle.LABEL_STYLE_TABLENAME_PLUS_COL`
+ that labels columns as `<tablename>_<columname>` was used for
+ :meth:`.Session.get` to maintain compatibility with :class:`_orm.Query`.
+ The change allows the string representation of ORM queries to be less
+ verbose in all cases outside of legacy :class:`_orm.Query` use. Pull
+ request courtesy Inada Naoki.
SELECT a.id, a.data, a.create_date
FROM a ORDER BY a.id
[...] ()
- SELECT b.a_id AS b_a_id, b.id AS b_id, b.data AS b_data
+ SELECT b.a_id, b.id, b.data
FROM b
WHERE b.a_id IN (?, ?, ?)
[...] (1, 2, 3)
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,)
{execsql}SELECT user_account.id, user_account.name, user_account.fullname
FROM user_account
[...] ()
- SELECT book.owner_id AS book_owner_id, book.id AS book_id, book.title AS book_title
+ SELECT book.owner_id, book.id, book.title
FROM book
WHERE book.owner_id IN (?, ?)
[...] (1, 2)
{execsql}SELECT user_account.id, user_account.name, user_account.fullname
FROM user_account
[...] ()
- SELECT book.id AS book_id, book.title AS book_title
+ SELECT book.id, book.title
FROM book
WHERE ? = book.owner_id
[...] (1,)
{stop}Spongebob Squarepants ['100 Years of Krabby Patties', 'Sea Catch 22', 'The Sea Grapes of Wrath']
- {execsql}SELECT book.id AS book_id, book.title AS book_title
+ {execsql}SELECT book.id, book.title
FROM book
WHERE ? = book.owner_id
[...] (2,)
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,)
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,)
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,)
SELECT company.id, company.name
FROM company
[...] ()
- SELECT employee.company_id AS employee_company_id, employee.id AS employee_id,
- employee.name AS employee_name, employee.type AS employee_type
+ SELECT employee.company_id, employee.id, employee.name, employee.type
FROM employee
WHERE employee.company_id IN (?)
[...] (1,)
FROM employee JOIN manager ON employee.id = manager.id
WHERE employee.id IN (?) ORDER BY employee.id
[...] (1,)
- SELECT paperwork.manager_id AS paperwork_manager_id, paperwork.id AS paperwork_id, paperwork.document_name AS paperwork_document_name
+ SELECT paperwork.manager_id, paperwork.id, paperwork.document_name
FROM paperwork
WHERE paperwork.manager_id IN (?)
[...] (1,)
SELECT company.id, company.name
FROM company
[...] ()
- SELECT employee.company_id AS employee_company_id, employee.id AS employee_id, employee.name AS employee_name, employee.type AS employee_type
+ SELECT employee.company_id, employee.id, employee.name, employee.type
FROM employee
WHERE employee.company_id IN (?)
[...] (1,)
FROM employee JOIN manager ON employee.id = manager.id
WHERE employee.id IN (?) ORDER BY employee.id
[...] (1,)
- SELECT paperwork.manager_id AS paperwork_manager_id, paperwork.id AS paperwork_id, paperwork.document_name AS paperwork_document_name
+ SELECT paperwork.manager_id, paperwork.id, paperwork.document_name
FROM paperwork
WHERE paperwork.manager_id IN (?)
[...] (1,)
{execsql}SELECT company.id, company.name
FROM company
[...] ()
- SELECT employee.company_id AS employee_company_id, employee.id AS employee_id,
- employee.name AS employee_name, employee.type AS employee_type, manager.id AS manager_id,
- manager.manager_name AS manager_manager_name, engineer.id AS engineer_id,
- engineer.engineer_info AS engineer_engineer_info
+ SELECT employee.company_id, employee.id, employee.name, employee.type,
+ manager.id, manager.manager_name, engineer.id, engineer.engineer_info
FROM employee
LEFT OUTER JOIN manager ON employee.id = manager.id
LEFT OUTER JOIN engineer ON employee.id = engineer.id
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')
{stop}
>>> patrick.addresses.append(Address(email_address="patrickstar@sqlalchemy.org"))
- {execsql}SELECT address.id AS address_id, address.email_address AS address_email_address, address.user_id AS address_user_id
+ {execsql}SELECT address.id, address.email_address, address.user_id
FROM address
WHERE ? = address.user_id
[...] (3,){stop}
>>> 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}
>>> sandy.addresses.remove(sandy_address)
- {execsql}SELECT address.id AS address_id, address.email_address AS address_email_address, address.user_id AS address_user_id
+ {execsql}SELECT address.id, address.email_address, address.user_id
FROM address
WHERE ? = address.user_id
[...] (2,)
.. 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,)
- SELECT address.id AS address_id, address.email_address AS address_email_address, address.user_id AS address_user_id
+ SELECT address.id, address.email_address, address.user_id
FROM address
WHERE ? = address.user_id
[...] (3,)
.. sourcecode:: pycon+sql
>>> patrick = session.get(User, 3)
- {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,)
.. sourcecode:: pycon+sql
>>> session.execute(select(User).where(User.name == "patrick")).first()
- {execsql}SELECT address.id AS address_id, address.email_address AS address_email_address,
- address.user_id AS address_user_id
+ {execsql}SELECT address.id, address.email_address, address.user_id
FROM address
WHERE ? = address.user_id
[...] (3,)
>>> 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}
>>> 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}
>>> 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}
.. sourcecode:: pycon+sql
>>> u1.addresses
- {execsql}SELECT address.id AS address_id, address.email_address AS address_email_address,
- address.user_id AS address_user_id
+ {execsql}SELECT address.id, address.email_address, address.user_id
FROM address
WHERE ? = address.user_id
[...] (6,){stop}
{execsql}SELECT user_account.id, user_account.name, user_account.fullname
FROM user_account ORDER BY user_account.id
[...] ()
- SELECT address.user_id AS address_user_id, address.id AS address_id,
- address.email_address AS address_email_address
+ SELECT address.user_id, address.id, address.email_address
FROM address
WHERE address.user_id IN (?, ?, ?, ?, ?, ?)
[...] (1, 2, 3, 4, 5, 6){stop}
{execsql}SELECT user_account.id
FROM user_account
[...] ()
- SELECT address.user_id AS address_user_id, address.id AS address_id
+ SELECT address.user_id, address.id
FROM address
WHERE address.user_id IN (?, ?, ?, ?, ?, ?)
[...] (1, 2, 3, 4, 5, 6)
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
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,
from . import sync
from .base import state_str
from .. import exc as sa_exc
-from .. import future
from .. import sql
from .. import util
from ..engine import cursor as _cursor
from ..sql import operators
from ..sql.elements import BooleanClauseList
-from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL
def _save_obj(base_mapper, states, uowtransaction, single=False):
if toload_now:
state.key = base_mapper._identity_key_from_state(state)
- stmt = future.select(mapper).set_label_style(
- LABEL_STYLE_TABLENAME_PLUS_COL
- )
+ stmt = sql.select(mapper)
loading._load_on_ident(
uowtransaction.session,
stmt,
from ..sql.base import CompileState
from ..sql.schema import Table
from ..sql.selectable import ForUpdateArg
-from ..sql.selectable import LABEL_STYLE_TABLENAME_PLUS_COL
from ..util import deprecated_params
from ..util import IdentitySet
from ..util.typing import TupleAny
# TODO: this was being tested before, but this is not possible
assert instance is not LoaderCallableStatus.PASSIVE_CLASS_MISMATCH
- # set_label_style() not strictly necessary, however this will ensure
- # that tablename_colname style is used which at the moment is
- # asserted in a lot of unit tests :)
-
load_options = context.QueryContext.default_load_options
if populate_existing:
load_options += {"_populate_existing": populate_existing}
- statement = sql.select(mapper).set_label_style(
- LABEL_STYLE_TABLENAME_PLUS_COL
- )
+ statement = sql.select(mapper)
if with_for_update is not None:
statement._for_update_arg = ForUpdateArg._from_argument(
with_for_update
stmt = Select._create_raw_select(
_raw_columns=[clauseelement],
_propagate_attrs=clauseelement._propagate_attrs,
- _label_style=LABEL_STYLE_TABLENAME_PLUS_COL,
_compile_options=_ORMCompileState.default_compile_options,
)
load_options = QueryContext.default_load_options
entity_sql = effective_entity.__clause_element__()
q = Select._create_raw_select(
_raw_columns=[bundle_sql, entity_sql],
- _label_style=LABEL_STYLE_TABLENAME_PLUS_COL,
_compile_options=_ORMCompileState.default_compile_options,
_propagate_attrs={
"compile_state_plugin": "orm",
.. seealso::
- :data:`_sql.LABEL_STYLE_DISAMBIGUATE_ONLY`
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_DISAMBIGUATE_ONLY`
- :data:`_sql.LABEL_STYLE_TABLENAME_PLUS_COL`
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_TABLENAME_PLUS_COL`
- :data:`_sql.LABEL_STYLE_NONE`
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_NONE`
- :data:`_sql.LABEL_STYLE_DEFAULT`
+ :attr:`_sql.SelectLabelStyle.LABEL_STYLE_DEFAULT`
"""
if self._label_style is not style:
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}],
),
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}],
)
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}],
),
s.flush()
asserter.assert_(
CompiledSQL(
- "SELECT a.id AS a_id, a.type AS a_type "
- "FROM a WHERE a.id = :pk_1",
+ "SELECT a.id, a.type FROM a WHERE a.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL("DELETE FROM a WHERE a.id = :id", [{"id": 1}]),
s.flush()
asserter.assert_(
CompiledSQL(
- "SELECT a.id AS a_id, a.type AS a_type "
- "FROM a WHERE a.id = :pk_1",
+ "SELECT a.id, a.type FROM a WHERE a.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL("DELETE FROM a WHERE a.id = :id", [{"id": 1}]),
s.flush()
asserter.assert_(
CompiledSQL(
- "SELECT a.id AS a_id, a.type AS a_type "
- "FROM a WHERE a.id = :pk_1",
+ "SELECT a.id, a.type FROM a WHERE a.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL("DELETE FROM a WHERE a.id = :id", [{"id": 1}]),
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},
bool(eager_defaults),
[
CompiledSQL(
- "SELECT base.counter AS base_counter, "
- "sub.subcounter AS sub_subcounter, "
- "sub.subcounter2 AS sub_subcounter2 "
+ "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},
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},
)
# cols a.id / asub.id are listed in the mapper's
# equivalent_columns so they are guaranteed to store
# the same value.
- "SELECT c.a_sub_id AS c_a_sub_id, "
- "c.id AS c_id "
+ "SELECT c.a_sub_id, c.id "
"FROM c WHERE c.a_sub_id "
"IN (__[POSTCOMPILE_primary_keys])",
{"primary_keys": [2]},
),
),
CompiledSQL(
- "SELECT b.a_id AS b_a_id, b.id AS b_id FROM b "
+ "SELECT b.a_id, b.id FROM b "
"WHERE b.a_id IN (__[POSTCOMPILE_primary_keys])",
{"primary_keys": [1, 2]},
),
{},
),
CompiledSQL(
- "SELECT people.company_id AS people_company_id, "
- "people.person_id AS people_person_id, "
- "people.name AS people_name, people.type AS people_type "
+ "SELECT people.company_id, "
+ "people.person_id, "
+ "people.name, people.type "
"FROM people WHERE people.company_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY people.person_id",
{},
),
CompiledSQL(
- "SELECT people.company_id AS people_company_id, "
- "people.person_id AS people_person_id, "
- "people.name AS people_name, people.type AS people_type "
+ "SELECT people.company_id, "
+ "people.person_id, "
+ "people.name, people.type "
"FROM people WHERE people.company_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY people.person_id",
{"primary_keys": [1, 2, 5]},
),
CompiledSQL(
- "SELECT machines.engineer_id AS machines_engineer_id, "
- "machines.machine_id AS machines_machine_id, "
- "machines.name AS machines_name "
+ "SELECT machines.engineer_id, "
+ "machines.machine_id, "
+ "machines.name "
"FROM machines "
"WHERE machines.engineer_id "
"IN (__[POSTCOMPILE_primary_keys]) "
if will_lazyload:
expected.append(
CompiledSQL(
- "SELECT entity.id AS entity_id, "
- "entity.type AS entity_type FROM entity "
+ "SELECT entity.id, "
+ "entity.type FROM entity "
"WHERE entity.id = :pk_1",
[{"pk_1": entity_id}],
)
asserter.assert_(
CompiledSQL(
- "SELECT log_entry_1.id AS log_entry_1_id, "
- "log_entry_1.timestamp AS log_entry_1_timestamp, "
- "log_entry_1.type AS log_entry_1_type "
+ "SELECT log_entry_1.id, "
+ "log_entry_1.timestamp, "
+ "log_entry_1.type "
"FROM log_entry AS log_entry_1 "
"WHERE log_entry_1.timestamp >= :param_1 AND "
"((SELECT min(log_entry_2.timestamp) AS min_1 "
],
),
CompiledSQL(
- "SELECT employee.company_id AS employee_company_id, "
- "employee.id AS employee_id, employee.name AS employee_name, "
- "employee.type AS employee_type, "
- "employee.executive_background AS "
- "employee_executive_background "
+ "SELECT employee.company_id, "
+ "employee.id, employee.name, "
+ "employee.type, "
+ "employee.executive_background "
"FROM employee WHERE employee.company_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"AND employee.type IN (__[POSTCOMPILE_type_1])",
asserter.assert_(
CompiledSQL(
- "SELECT b.id AS b_id FROM b JOIN d ON d.b_id = b.id "
+ "SELECT b.id FROM b JOIN d ON d.b_id = b.id "
"JOIN c ON c.id = d.c_id WHERE :param_1 = b.id",
[{"param_1": 1}],
)
[{"param_1": 1}],
),
CompiledSQL(
- "SELECT a_1.id AS a_1_id, b.id AS b_id FROM a AS a_1 "
+ "SELECT a_1.id, b.id FROM a AS a_1 "
"JOIN (b JOIN d ON d.b_id = b.id JOIN c ON c.id = d.c_id) "
"ON a_1.b_id = b.id WHERE a_1.id "
"IN (__[POSTCOMPILE_primary_keys])",
sess.flush,
# looking for other bs'
CompiledSQL(
- "SELECT b.id AS b_id, b.email AS b_email "
- "FROM b WHERE :param_1 = b.email",
+ "SELECT b.id, b.email " "FROM b WHERE :param_1 = b.email",
lambda ctx: [{"param_1": "x"}],
),
CompiledSQL(
# we would like it to be able to skip this SELECT but this is not
# implemented right now
CompiledSQL(
- "SELECT a.id AS a_id, a.email AS a_email FROM a "
- "WHERE a.email = :param_1",
+ "SELECT a.id, a.email FROM a " "WHERE a.email = :param_1",
[{"param_1": "x"}],
),
CompiledSQL(
[{"foo": 5, "id": 1}, {"foo": 10, "id": 2}],
),
CompiledSQL(
- "SELECT test.bar AS test_bar FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.bar FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test.bar AS test_bar FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.bar FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
),
],
enable_returning=False,
),
CompiledSQL(
- "SELECT test.bar AS test_bar FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.bar FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
enable_returning=False,
),
CompiledSQL(
- "SELECT test.bar AS test_bar FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.bar FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
enable_returning=False,
),
[{"foo": 5, "test_id": 1}, {"foo": 6, "test_id": 2}],
),
CompiledSQL(
- "SELECT test.bar AS test_bar FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.bar FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test.bar AS test_bar FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.bar FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
),
)
{},
),
(
- "SELECT orders.description AS orders_description "
+ "SELECT orders.description "
"FROM orders WHERE orders.id = :pk_1",
{"pk_1": 3},
),
{},
),
(
- "SELECT orders.description AS orders_description "
+ "SELECT orders.description "
"FROM orders WHERE orders.id = :pk_1",
{"pk_1": 3},
),
{},
),
(
- "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},
),
{},
),
(
- "SELECT orders.user_id AS orders_user_id "
+ "SELECT orders.user_id "
"FROM orders WHERE orders.id = :pk_1",
{"pk_1": 1},
),
{"id_1": 3},
),
(
- "SELECT users.id AS users_id, users.name AS users_name "
+ "SELECT users.id, users.name "
"FROM users WHERE users.id IN "
"(__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [7]}],
{"id_1": 7},
),
(
- "SELECT orders.id AS orders_id, "
- "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.id, "
+ "orders.user_id, "
+ "orders.address_id, "
+ "orders.description, "
+ "orders.isopen "
"FROM orders WHERE :param_1 = orders.user_id "
"ORDER BY orders.id",
{"param_1": 7},
{"id_1": [7, 8]},
),
(
- "SELECT addresses.id AS addresses_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id",
{"param_1": 7},
),
(
- "SELECT addresses.id AS addresses_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id",
{"param_1": 8},
),
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}],
),
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}],
),
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}],
),
testing.db,
go,
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS "
- "addresses_user_id, addresses.email_address AS "
- "addresses_email_address FROM addresses WHERE :param_1 = "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
+ "FROM addresses WHERE :param_1 = "
"addresses.user_id",
{"param_1": 8},
),
testing.db,
go,
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS "
- "addresses_user_id, addresses.email_address AS "
- "addresses_email_address FROM addresses WHERE :param_1 = "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
+ "FROM addresses WHERE :param_1 = "
"addresses.user_id",
{"param_1": 8},
),
{"id_1": 7},
),
(
- "SELECT orders.id AS orders_id, "
- "orders.user_id AS orders_user_id, "
- "orders.address_id AS orders_address_id, "
- "orders.description AS orders_description, "
- "orders.isopen AS orders_isopen FROM orders "
+ "SELECT orders.id, "
+ "orders.user_id, "
+ "orders.address_id, "
+ "orders.description, "
+ "orders.isopen FROM orders "
"WHERE :param_1 = orders.user_id",
{"param_1": 7},
),
testing.db,
lambda: c1.child2,
CompiledSQL(
- "SELECT child2.id AS child2_id, base.id AS base_id, "
- "base.type AS base_type "
+ "SELECT child2.id, base.id, "
+ "base.type "
"FROM base JOIN child2 ON base.id = child2.id "
"WHERE base.id = :pk_1",
{"pk_1": 4},
testing.db,
lambda: c1.child2,
CompiledSQL(
- "SELECT child2.id AS child2_id, base.id AS base_id, "
- "base.type AS base_type "
+ "SELECT child2.id, base.id, "
+ "base.type "
"FROM base JOIN child2 ON base.id = child2.id "
"WHERE base.id = :pk_1",
{"pk_1": 4},
testing.db,
lambda: c1.child2,
CompiledSQL(
- "SELECT child2.id AS child2_id, base.id AS base_id, "
- "base.type AS base_type, "
- "related_1.id AS related_1_id FROM base JOIN child2 "
+ "SELECT child2.id, base.id, "
+ "base.type, "
+ "related_1.id FROM base JOIN child2 "
"ON base.id = child2.id "
"LEFT OUTER JOIN related AS related_1 "
"ON base.id = related_1.id WHERE base.id = :pk_1",
[{"id_1": 7}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, addresses.user_id AS "
- "addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"ORDER BY addresses.id",
[{"param_1": 7}],
testing.db,
go,
CompiledSQL(
- "SELECT person.id AS person_id, person.city_id AS "
- "person_city_id FROM person WHERE person.city_id = :param_1 "
+ "SELECT person.id, person.city_id "
+ "FROM person WHERE person.city_id = :param_1 "
"AND :param_2 = 0",
{"param_1": 2, "param_2": 1},
),
asserter.assert_(
CompiledSQL(
- "SELECT pets.id AS pets_id, pets.person_id AS "
- "pets_person_id FROM pets WHERE pets.person_id = "
+ "SELECT pets.id, pets.person_id "
+ "FROM pets WHERE pets.person_id = "
"CAST(:param_1 AS INTEGER)",
[{"param_1": 5}],
)
go,
[
(
- "SELECT book.summary AS book_summary "
- "FROM book WHERE book.id = :pk_1",
+ "SELECT book.summary FROM book WHERE book.id = :pk_1",
{"pk_1": 1},
),
(
- "SELECT book.excerpt AS book_excerpt "
- "FROM book WHERE book.id = :pk_1",
+ "SELECT book.excerpt FROM book WHERE book.id = :pk_1",
{"pk_1": 1},
),
],
go,
[
(
- "SELECT book.summary AS book_summary "
- "FROM book WHERE book.id = :pk_1",
+ "SELECT book.summary FROM book WHERE book.id = :pk_1",
{"pk_1": 1},
),
(
- "SELECT book.excerpt AS book_excerpt "
- "FROM book WHERE book.id = :pk_1",
+ "SELECT book.excerpt FROM book WHERE book.id = :pk_1",
{"pk_1": 1},
),
],
[],
),
CompiledSQL(
- "SELECT addresses.user_id AS addresses_user_id, addresses.id "
- "AS addresses_id, addresses.email_address "
- "AS addresses_email_address FROM addresses "
+ "SELECT addresses.user_id, addresses.id, "
+ "addresses.email_address "
+ "FROM addresses "
"WHERE addresses.user_id IN (__[POSTCOMPILE_primary_keys]) "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[],
),
CompiledSQL(
- "SELECT addresses.user_id AS addresses_user_id, addresses.id "
- "AS addresses_id, addresses.email_address "
- "AS addresses_email_address FROM addresses "
+ "SELECT addresses.user_id, addresses.id, "
+ "addresses.email_address "
+ "FROM addresses "
"WHERE addresses.user_id IN (__[POSTCOMPILE_primary_keys]) "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[],
),
CompiledSQL(
- "SELECT addresses.user_id AS addresses_user_id, addresses.id "
- "AS addresses_id, addresses.email_address "
- "AS addresses_email_address FROM addresses "
+ "SELECT addresses.user_id, addresses.id, "
+ "addresses.email_address "
+ "FROM addresses "
"WHERE addresses.user_id IN (__[POSTCOMPILE_primary_keys]) "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[{"param_1": 7, "email_address_1": "name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[{"param_1": 8, "email_address_1": "name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[{"param_1": 9, "email_address_1": "name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[{"param_1": 7, "closure_1": "name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[{"param_1": 8, "closure_1": "name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[{"param_1": 9, "closure_1": "name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[{"param_1": 7, "closure_1": "new name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[{"param_1": 8, "closure_1": "new name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
[{"param_1": 9, "closure_1": "new name"}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :closure_1 "
"ORDER BY addresses.id",
"SELECT users.id, users.name FROM users ORDER BY users.id"
),
CompiledSQL(
- "SELECT addresses.user_id AS addresses_user_id, "
- "addresses.id AS addresses_id, addresses.email_address "
- "AS addresses_email_address FROM addresses "
+ "SELECT addresses.user_id, addresses.id, "
+ "addresses.email_address "
+ "FROM addresses "
"WHERE addresses.user_id IN "
"(__[POSTCOMPILE_primary_keys]) "
"AND addresses.email_address != :email_address_1 "
"SELECT users.id, users.name FROM users ORDER BY users.id"
),
CompiledSQL(
- "SELECT addresses.user_id AS addresses_user_id, "
- "addresses.id AS addresses_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.user_id, addresses.id, "
+ "addresses.email_address "
# note the comma-separated FROM clause
"FROM addresses, (SELECT addresses_1.id AS id FROM "
"addresses AS addresses_1 "
[{"id_1": 7}],
),
CompiledSQL(
- "SELECT orders.user_id AS orders_user_id, "
- "orders.id AS orders_id, "
- "orders.address_id AS orders_address_id, "
- "orders.description AS orders_description, "
- "orders.isopen AS orders_isopen, "
- "items_1.id AS items_1_id, "
- "items_1.description AS items_1_description "
+ "SELECT orders.user_id, "
+ "orders.id, "
+ "orders.address_id, "
+ "orders.description, "
+ "orders.isopen, "
+ "items_1.id, "
+ "items_1.description "
"FROM orders LEFT OUTER JOIN "
"(order_items AS order_items_1 "
"JOIN items AS items_1 "
"SELECT users.id, users.name FROM users ORDER BY users.id"
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[{"param_1": 7, "email_address_1": value}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[{"param_1": 8, "email_address_1": value}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
[{"param_1": 9, "email_address_1": value}],
),
CompiledSQL(
- "SELECT addresses.id AS addresses_id, "
- "addresses.user_id AS addresses_user_id, "
- "addresses.email_address AS addresses_email_address "
+ "SELECT addresses.id, "
+ "addresses.user_id, "
+ "addresses.email_address "
"FROM addresses WHERE :param_1 = addresses.user_id "
"AND addresses.email_address != :email_address_1 "
"ORDER BY addresses.id",
testing.db,
go,
CompiledSQL(
- "SELECT d.id AS d_id, d.name AS d_name FROM b "
+ "SELECT d.id, d.name FROM b "
"JOIN d ON b.d_id = d.id JOIN c ON c.d_id = d.id "
"WHERE :param_1 = b.id AND :param_2 = c.a_id "
"AND d.id = b.d_id",
params=[{"id_1": 2}],
),
CompiledSQL(
- "SELECT a_1.id AS a_1_id, b.id AS b_id FROM a AS a_1 JOIN "
+ "SELECT a_1.id, b.id FROM a AS a_1 JOIN "
"(SELECT a.id AS aid, b.id AS id FROM a JOIN b ON a.b_ids "
"LIKE (:id_1 || b.id || :param_1)) AS anon_1 "
"ON a_1.id = anon_1.aid JOIN b ON b.id = anon_1.id "
{"primary_language_1": "java"},
),
CompiledSQL(
- "SELECT paperwork.person_id AS paperwork_person_id, "
- "paperwork.paperwork_id AS paperwork_paperwork_id, "
- "paperwork.description AS paperwork_description "
+ "SELECT paperwork.person_id, "
+ "paperwork.paperwork_id, "
+ "paperwork.description "
"FROM paperwork WHERE paperwork.person_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY paperwork.paperwork_id",
},
),
CompiledSQL(
- "SELECT paperwork.person_id AS paperwork_person_id, "
- "paperwork.paperwork_id AS paperwork_paperwork_id, "
- "paperwork.description AS paperwork_description "
+ "SELECT paperwork.person_id, "
+ "paperwork.paperwork_id, "
+ "paperwork.description "
"FROM paperwork WHERE paperwork.person_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY paperwork.paperwork_id",
"DESC LIMIT :param_1"
),
CompiledSQL(
- "SELECT paperwork.person_id AS paperwork_person_id, "
- "paperwork.paperwork_id AS paperwork_paperwork_id, "
- "paperwork.description AS paperwork_description "
+ "SELECT paperwork.person_id, "
+ "paperwork.paperwork_id, "
+ "paperwork.description "
"FROM paperwork WHERE paperwork.person_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY paperwork.paperwork_id",
"LIMIT :param_1"
),
CompiledSQL(
- "SELECT paperwork.person_id AS paperwork_person_id, "
- "paperwork.paperwork_id AS paperwork_paperwork_id, "
- "paperwork.description AS paperwork_description "
+ "SELECT paperwork.person_id, "
+ "paperwork.paperwork_id, "
+ "paperwork.description "
"FROM paperwork WHERE paperwork.person_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY paperwork.paperwork_id",
"ORDER BY engineers_1.primary_language DESC LIMIT :param_1"
),
CompiledSQL(
- "SELECT paperwork.person_id AS paperwork_person_id, "
- "paperwork.paperwork_id AS paperwork_paperwork_id, "
- "paperwork.description AS paperwork_description "
+ "SELECT paperwork.person_id, "
+ "paperwork.paperwork_id, "
+ "paperwork.description "
"FROM paperwork WHERE paperwork.person_id "
"IN (__[POSTCOMPILE_primary_keys]) "
"ORDER BY paperwork.paperwork_id",
{},
),
CompiledSQL(
- "SELECT b.a_id1 AS b_a_id1, b.a_id2 AS b_a_id2, b.id AS b_id "
+ "SELECT b.a_id1, b.a_id2, b.id "
"FROM b WHERE (b.a_id1, b.a_id2) IN "
"(__[POSTCOMPILE_primary_keys]) ORDER BY b.id",
[{"primary_keys": [(i, i + 2) for i in range(1, 20)]}],
{},
),
CompiledSQL(
- "SELECT a.id1 AS a_id1, a.id2 AS a_id2 FROM a "
+ "SELECT a.id1, a.id2 FROM a "
"WHERE (a.id1, a.id2) IN (__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [(i, i + 2) for i in range(1, 20)]}],
),
go,
CompiledSQL("SELECT a.id AS a_id FROM a ORDER BY a.id", {}),
CompiledSQL(
- "SELECT b.a_id AS b_a_id, b.id AS b_id "
+ "SELECT b.a_id, b.id "
"FROM b WHERE b.a_id IN "
"(__[POSTCOMPILE_primary_keys]) ORDER BY b.id",
{"primary_keys": list(range(1, 48))},
),
CompiledSQL(
- "SELECT b.a_id AS b_a_id, b.id AS b_id "
+ "SELECT b.a_id, b.id "
"FROM b WHERE b.a_id IN "
"(__[POSTCOMPILE_primary_keys]) ORDER BY b.id",
{"primary_keys": list(range(48, 95))},
),
CompiledSQL(
- "SELECT b.a_id AS b_a_id, b.id AS b_id "
+ "SELECT b.a_id, b.id "
"FROM b WHERE b.a_id IN "
"(__[POSTCOMPILE_primary_keys]) ORDER BY b.id",
{"primary_keys": list(range(95, 101))},
),
# chunk size is 47. so first chunk are a 1->47...
CompiledSQL(
- "SELECT a.id AS a_id FROM a WHERE a.id IN "
+ "SELECT a.id FROM a WHERE a.id IN "
"(__[POSTCOMPILE_primary_keys])",
{"primary_keys": list(range(1, 48))},
),
# second chunk is a 48-94
CompiledSQL(
- "SELECT a.id AS a_id FROM a WHERE a.id IN "
+ "SELECT a.id FROM a WHERE a.id IN "
"(__[POSTCOMPILE_primary_keys])",
{"primary_keys": list(range(48, 95))},
),
# third and final chunk 95-100.
CompiledSQL(
- "SELECT a.id AS a_id FROM a WHERE a.id IN "
+ "SELECT a.id FROM a WHERE a.id IN "
"(__[POSTCOMPILE_primary_keys])",
{"primary_keys": list(range(95, 101))},
),
[{"id_1": 2}],
),
CompiledSQL(
- "SELECT foo_1.id AS foo_1_id, "
- "foo_1.type AS foo_1_type, foo_1.foo_id AS foo_1_foo_id "
+ "SELECT foo_1.id, foo_1.type, foo_1.foo_id "
"FROM foo AS foo_1 "
"WHERE foo_1.id IN (__[POSTCOMPILE_primary_keys])",
{"primary_keys": [3]},
),
CompiledSQL(
- "SELECT foo.id AS foo_id_1, foo.type AS foo_type, "
- "foo.foo_id AS foo_foo_id FROM foo "
+ "SELECT foo.id, foo.type, "
+ "foo.foo_id FROM foo "
"WHERE foo.id IN (__[POSTCOMPILE_primary_keys])",
{"primary_keys": [1]},
),
{"type_1": ["employer"]},
),
CompiledSQL(
- "SELECT role.user_id AS role_user_id, role.id AS role_id "
+ "SELECT role.user_id, role.id "
"FROM role WHERE role.user_id "
"IN (__[POSTCOMPILE_primary_keys])",
{"primary_keys": [1]},
[{"id_1": [1, 3]}],
),
CompiledSQL(
- "SELECT b.id AS b_id, b.x AS b_x, b.y AS b_y "
+ "SELECT b.id, b.x, b.y "
"FROM b WHERE b.id IN (__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [1, 2]}],
),
# emit either for each parent object individually, or as a second
# query for them.
CompiledSQL(
- "SELECT a_1.id AS a_1_id, b.id AS b_id, b.x AS b_x, "
- "b.y AS b_y "
+ "SELECT a_1.id, b.id, b.x, b.y "
"FROM a AS a_1 JOIN b ON b.id = a_1.b_id "
"WHERE a_1.id IN (__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [1, 3]}],
[{}],
),
CompiledSQL(
- "SELECT b.id AS b_id, b.x AS b_x, b.y AS b_y "
+ "SELECT b.id, b.x, b.y "
"FROM b WHERE b.id IN (__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [1, 2]}],
),
[{}],
),
CompiledSQL(
- "SELECT a_1.id AS a_1_id, b.id AS b_id, b.x AS b_x, "
- "b.y AS b_y FROM a AS a_1 JOIN b ON b.id = a_1.b_id "
+ "SELECT a_1.id, b.id, b.x, b.y "
+ "FROM a AS a_1 JOIN b ON b.id = a_1.b_id "
"WHERE a_1.id IN (__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [1, 2, 3, 4, 5]}],
),
# emit either for each parent object individually, or as a second
# query for them.
CompiledSQL(
- "SELECT a_1.id AS a_1_id, b.id AS b_id, b.x AS b_x, "
- "b.y AS b_y "
+ "SELECT a_1.id, b.id, b.x, b.y "
"FROM a AS a_1 JOIN b ON b.id = a_1.b_id "
"WHERE a_1.id IN (__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [1, 2, 3, 4, 5]}],
),
AllOf(
CompiledSQL(
- "SELECT child_a.parent_id AS child_a_parent_id, "
- "child_a.id AS child_a_id FROM child_a "
+ "SELECT child_a.parent_id, "
+ "child_a.id FROM child_a "
"WHERE child_a.parent_id IN "
"(__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [1]}],
),
CompiledSQL(
- "SELECT child_b.parent_id AS child_b_parent_id, "
- "child_b.id AS child_b_id FROM child_b "
+ "SELECT child_b.parent_id, "
+ "child_b.id FROM child_b "
"WHERE child_b.parent_id IN "
"(__[POSTCOMPILE_primary_keys])",
[{"primary_keys": [2]}],
# issue 7505
# subqueryload degrades for a from_statement. this is a lazyload
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 :param_1 = addresses.user_id ORDER BY addresses.id",
[{"param_1": 7}],
),
# 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},
),
# 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},
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},
sess.flush,
# for the flush process, lazy="raise" is ignored
CompiledSQL(
- "SELECT b.id AS b_id, b.a_id AS b_a_id FROM b "
- "WHERE :param_1 = b.a_id",
+ "SELECT b.id, b.a_id FROM b WHERE :param_1 = b.a_id",
[{"param_1": 1}],
),
CompiledSQL(
# 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},
),
# this is n1.parents firing off, as it should, since
# passive_deletes is False for n1.parents
CompiledSQL(
- "SELECT nodes.id AS nodes_id, nodes.data AS nodes_data, "
- "nodes.favorite_node_id AS nodes_favorite_node_id FROM "
+ "SELECT nodes.id, nodes.data, "
+ "nodes.favorite_node_id FROM "
"nodes, node_to_nodes WHERE :param_1 = "
"node_to_nodes.right_node_id AND nodes.id = "
"node_to_nodes.left_node_id",
enable_returning=False,
),
CompiledSQL(
- "SELECT test.foo AS test_foo FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.foo FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
enable_returning=False,
),
CompiledSQL(
- "SELECT test.foo AS test_foo FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.foo FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
enable_returning=False,
),
[{"id": 1}, {"id": 2}],
),
CompiledSQL(
- "SELECT test.foo AS test_foo FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.foo FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test.foo AS test_foo FROM test "
- "WHERE test.id = :pk_1",
+ "SELECT test.foo FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
),
],
],
),
CompiledSQL(
- "SELECT test3.foo AS test3_foo "
+ "SELECT test3.foo "
"FROM test3 WHERE test3.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test3.foo AS test3_foo "
+ "SELECT test3.foo "
"FROM test3 WHERE test3.id = :pk_1",
[{"pk_1": 2}],
),
enable_returning=False,
),
CompiledSQL(
- "SELECT test2.bar AS test2_bar FROM test2 "
+ "SELECT test2.bar FROM test2 "
"WHERE test2.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test2.bar AS test2_bar FROM test2 "
+ "SELECT test2.bar FROM test2 "
"WHERE test2.id = :pk_1",
[{"pk_1": 3}],
),
enable_returning=False,
),
CompiledSQL(
- "SELECT test4.bar AS test4_bar FROM test4 "
+ "SELECT test4.bar FROM test4 "
"WHERE test4.id = :pk_1",
[{"pk_1": 1}],
enable_returning=False,
),
CompiledSQL(
- "SELECT test4.bar AS test4_bar FROM test4 "
+ "SELECT test4.bar FROM test4 "
"WHERE test4.id = :pk_1",
[{"pk_1": 3}],
enable_returning=False,
enable_returning=False,
),
CompiledSQL(
- "SELECT test2.bar AS test2_bar FROM test2 "
- "WHERE test2.id = :pk_1",
+ "SELECT test2.bar FROM test2 WHERE test2.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test2.bar AS test2_bar FROM test2 "
- "WHERE test2.id = :pk_1",
+ "SELECT test2.bar FROM test2 WHERE test2.id = :pk_1",
[{"pk_1": 3}],
),
CompiledSQL(
- "SELECT test2.bar AS test2_bar FROM test2 "
- "WHERE test2.id = :pk_1",
+ "SELECT test2.bar FROM test2 WHERE test2.id = :pk_1",
[{"pk_1": 4}],
),
)
[{"id": 1, "bar": 5}],
),
CompiledSQL(
- "SELECT anon_1.foo AS anon_1_foo FROM "
+ "SELECT anon_1.foo FROM "
"(SELECT test.id AS id, test.foo AS foo, "
"test2.id AS id2, test2.bar AS bar FROM test "
"JOIN test2 ON test.foo = test2.foo) AS anon_1 "
expected_eager_defaults and not expect_returning,
[
CompiledSQL(
- "SELECT test.foo AS test_foo "
+ "SELECT test.foo "
"FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test.foo AS test_foo "
+ "SELECT test.foo "
"FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
),
expected_eager_defaults and not expect_returning,
[
CompiledSQL(
- "SELECT test.foo AS test_foo "
+ "SELECT test.foo "
"FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test.foo AS test_foo "
+ "SELECT test.foo "
"FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
),
],
),
CompiledSQL(
- "SELECT test.bar AS test_bar "
+ "SELECT test.bar "
"FROM test WHERE test.id = :pk_1",
[{"pk_1": 1}],
),
CompiledSQL(
- "SELECT test.bar AS test_bar "
+ "SELECT test.bar "
"FROM test WHERE test.id = :pk_1",
[{"pk_1": 2}],
),
statements.append(
CompiledSQL(
"SELECT version_table.version_id "
- "AS version_table_version_id "
"FROM version_table WHERE version_table.id = :pk_1",
lambda ctx: [{"pk_1": 1}],
)
),
CompiledSQL(
"SELECT version_table.version_id "
- "AS version_table_version_id "
"FROM version_table WHERE version_table.id = :pk_1",
lambda ctx: [{"pk_1": 1}],
),
),
CompiledSQL(
"SELECT version_table.version_id "
- "AS version_table_version_id "
"FROM version_table WHERE version_table.id = :pk_1",
lambda ctx: [{"pk_1": 1}],
),
CompiledSQL(
"SELECT version_table.version_id "
- "AS version_table_version_id "
"FROM version_table WHERE version_table.id = :pk_1",
lambda ctx: [{"pk_1": 2}],
),
CompiledSQL(
"SELECT version_table.version_id "
- "AS version_table_version_id "
"FROM version_table WHERE version_table.id = :pk_1",
lambda ctx: [{"pk_1": 3}],
),
# TEST: test.aaa_profiling.test_orm.MergeTest.test_merge_load
-test.aaa_profiling.test_orm.MergeTest.test_merge_load x86_64_linux_cpython_3.13_sqlite_pysqlite_dbapiunicode_cextensions 1491
+test.aaa_profiling.test_orm.MergeTest.test_merge_load x86_64_linux_cpython_3.13_sqlite_pysqlite_dbapiunicode_cextensions 1332
test.aaa_profiling.test_orm.MergeTest.test_merge_load x86_64_linux_cpython_3.13_sqlite_pysqlite_dbapiunicode_nocextensions 1603
-test.aaa_profiling.test_orm.MergeTest.test_merge_load x86_64_linux_cpython_3.14_sqlite_pysqlite_dbapiunicode_cextensions 1492
+test.aaa_profiling.test_orm.MergeTest.test_merge_load x86_64_linux_cpython_3.14_sqlite_pysqlite_dbapiunicode_cextensions 1333
test.aaa_profiling.test_orm.MergeTest.test_merge_load x86_64_linux_cpython_3.14_sqlite_pysqlite_dbapiunicode_nocextensions 1604
# TEST: test.aaa_profiling.test_orm.MergeTest.test_merge_no_load
projects / thirdparty / sqlalchemy / sqlalchemy.git / commitdiff
