summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/compiler.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/sql/compiler.py')
-rw-r--r--lib/sqlalchemy/sql/compiler.py34
1 files changed, 2 insertions, 32 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py
index db13cff01..ef7db0bbe 100644
--- a/lib/sqlalchemy/sql/compiler.py
+++ b/lib/sqlalchemy/sql/compiler.py
@@ -1718,18 +1718,13 @@ class SQLCompiler(Compiled):
extract.expr._compiler_dispatch(self, **kwargs),
)
- def visit_scalar_function_column(self, element, **kw):
- compiled_fn = self.visit_function(element.fn, **kw)
- compiled_col = self.visit_column(element, **kw)
- return "(%s).%s" % (compiled_fn, compiled_col)
-
def visit_function(self, func, add_to_result_map=None, **kwargs):
if add_to_result_map is not None:
add_to_result_map(func.name, func.name, (), func.type)
disp = getattr(self, "visit_%s_func" % func.name.lower(), None)
if disp:
- text = disp(func, **kwargs)
+ return disp(func, **kwargs)
else:
name = FUNCTIONS.get(func.__class__, None)
if name:
@@ -1744,7 +1739,7 @@ class SQLCompiler(Compiled):
else name
)
name = name + "%(expr)s"
- text = ".".join(
+ return ".".join(
[
(
self.preparer.quote(tok)
@@ -1757,10 +1752,6 @@ class SQLCompiler(Compiled):
+ [name]
) % {"expr": self.function_argspec(func, **kwargs)}
- if func._with_ordinality:
- text += " WITH ORDINALITY"
- return text
-
def visit_next_value_func(self, next_value, **kw):
return self.visit_sequence(next_value.sequence)
@@ -2536,27 +2527,6 @@ class SQLCompiler(Compiled):
else:
return self.preparer.format_alias(cte, cte_name)
- def visit_table_valued_alias(self, element, **kw):
- text = self.visit_alias(element, **kw)
- if kw.get("asfrom") and element.named:
- text += "(%s)" % (
- ", ".join(
- "%s%s"
- % (
- col.name,
- " %s"
- % self.dialect.type_compiler.process(col.type, **kw)
- if not col.type._isnull
- else "",
- )
- for col in element.element.c
- )
- )
- return text
-
- def visit_table_valued_column(self, element, **kw):
- return self.visit_column(element, **kw)
-
def visit_alias(
self,
alias,