summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/elements.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2023-04-21 16:51:19 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2023-04-21 16:51:19 +0000
commitc84b3bf198c75ad4f42b0f83d482e480200e6d16 (patch)
tree86e991ad8f43515ec7948ff809f44bb7d8b301fa /lib/sqlalchemy/sql/elements.py
parent95628d9707cdfbfdd229b2acee02fbadfbe7ced0 (diff)
parentcf6872d3bdf1a8a9613e853694acc2b1e6f06f51 (diff)
downloadsqlalchemy-c84b3bf198c75ad4f42b0f83d482e480200e6d16.tar.gz
Merge "add deterministic imv returning ordering using sentinel columns" into main
Diffstat (limited to 'lib/sqlalchemy/sql/elements.py')
-rw-r--r--lib/sqlalchemy/sql/elements.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index b32201c7f..ff47ec79d 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -91,7 +91,6 @@ if typing.TYPE_CHECKING:
from .compiler import SQLCompiler
from .functions import FunctionElement
from .operators import OperatorType
- from .schema import _ServerDefaultType
from .schema import Column
from .schema import DefaultGenerator
from .schema import FetchedValue
@@ -1306,6 +1305,8 @@ class ColumnElement(
primary_key: bool = False
_is_clone_of: Optional[ColumnElement[_T]]
_is_column_element = True
+ _insert_sentinel: bool = False
+ _omit_from_statements = False
foreign_keys: AbstractSet[ForeignKey] = frozenset()
@@ -2255,6 +2256,8 @@ class TextClause(
_render_label_in_columns_clause = False
+ _omit_from_statements = False
+
@property
def _hide_froms(self) -> Iterable[FromClause]:
return ()
@@ -4710,7 +4713,7 @@ class ColumnClause(
onupdate: Optional[DefaultGenerator] = None
default: Optional[DefaultGenerator] = None
- server_default: Optional[_ServerDefaultType] = None
+ server_default: Optional[FetchedValue] = None
server_onupdate: Optional[FetchedValue] = None
_is_multiparam_column = False