__visit_name__ = 'default_generator'
+ is_sequence = False
+
def __init__(self, for_update=False):
self.for_update = for_update
if util.callable(arg):
arg = self._maybe_wrap_callable(arg)
self.arg = arg
-
+
+ @util.memoized_property
+ def is_callable(self):
+ return util.callable(self.arg)
+
+ @util.memoized_property
+ def is_clause_element(self):
+ return isinstance(self.arg, expression.ClauseElement)
+
def _maybe_wrap_callable(self, fn):
"""Backward compat: Wrap callables that don't accept a context."""
__visit_name__ = 'sequence'
+ is_sequence = True
+
def __init__(self, name, start=None, increment=None, schema=None,
optional=False, quote=None, metadata=None, for_update=False):
super(Sequence, self).__init__(for_update=for_update)
self.schema = schema
self.metadata = metadata
+ @util.memoized_property
+ def is_callable(self):
+ return False
+
+ @util.memoized_property
+ def is_clause_element(self):
+ return False
+
def __repr__(self):
return "Sequence(%s)" % ', '.join(
[repr(self.name)] +
):
if implicit_returning:
- if isinstance(c.default, schema.Sequence):
+ if c.default is not None and c.default.is_sequence:
proc = self.process(c.default)
if proc is not None:
values.append((c, proc))
self.returning.append(c)
- elif isinstance(c.default, schema.ColumnDefault) and \
- isinstance(c.default.arg, sql.ClauseElement):
+ elif c.default is not None and c.default.is_clause_element:
values.append((c, self.process(c.default.arg.self_group())))
self.returning.append(c)
elif c.default is not None:
c.default is not None and \
(
self.dialect.supports_sequences or
- not isinstance(c.default, schema.Sequence)
+ not c.default.is_sequence
)
) or self.dialect.preexecute_autoincrement_sequences:
values.append((c, self._create_crud_bind_param(c, None)))
self.prefetch.append(c)
- elif isinstance(c.default, schema.Sequence):
+ elif c.default is not None and c.default.is_sequence:
proc = self.process(c.default)
if proc is not None:
values.append((c, proc))
if not c.primary_key:
self.postfetch.append(c)
- elif isinstance(c.default, schema.ColumnDefault) and \
- isinstance(c.default.arg, sql.ClauseElement):
+ elif c.default is not None and c.default.is_clause_element:
values.append((c, self.process(c.default.arg.self_group())))
if not c.primary_key:
if not c.primary_key:
self.postfetch.append(c)
elif self.isupdate:
- if isinstance(c.onupdate, schema.ColumnDefault):
- if isinstance(c.onupdate.arg, sql.ClauseElement):
+ if c.onupdate is not None and not c.onupdate.is_sequence:
+ if c.onupdate.is_clause_element:
values.append((c, self.process(c.onupdate.arg.self_group())))
self.postfetch.append(c)
else:
def test_profile_1_create_tables(self):
self.test_baseline_1_create_tables()
- @profiling.function_call_count(5726, {'2.4': 3650})
+ @profiling.function_call_count(5371, {'2.4': 3650})
def test_profile_1a_populate(self):
self.test_baseline_1a_populate()
- @profiling.function_call_count(282, {'2.4': 186})
+ @profiling.function_call_count(259, {'2.4': 186})
def test_profile_2_insert(self):
self.test_baseline_2_insert()