# HG changeset patch # User wenzelm # Date 1494256600 -7200 # Node ID 666a1bac126ba19aa2640dd179e3bc093581483e # Parent 821e77ce41be22d55a87c6bc0322dd856cc080a6 tuned signature; diff -r 821e77ce41be -r 666a1bac126b src/Pure/Admin/build_log.scala --- a/src/Pure/Admin/build_log.scala Mon May 08 16:38:11 2017 +0200 +++ b/src/Pure/Admin/build_log.scala Mon May 08 17:16:40 2017 +0200 @@ -703,7 +703,7 @@ distinct: Boolean = false): SQL.Source = { val table2 = recent_pull_date_table(days) - table1.select(columns, distinct = distinct) + SQL.join_inner + table2.query_name + + table1.select(columns, distinct = distinct) + SQL.join_inner + table2.query_named + " ON " + Prop.isabelle_version(table1) + " = " + Prop.isabelle_version(table2) } @@ -725,7 +725,7 @@ val columns = aux_columns ::: sessions_table.columns.tail SQL.Table("isabelle_build_log", columns, { - SQL.select(log_name(aux_table) :: columns.tail) + aux_table.query_name + + SQL.select(log_name(aux_table) :: columns.tail) + aux_table.query_named + SQL.join_inner + table3 + " ON " + log_name(aux_table) + " = " + log_name(table3) }) } diff -r 821e77ce41be -r 666a1bac126b src/Pure/General/sql.scala --- a/src/Pure/General/sql.scala Mon May 08 16:38:11 2017 +0200 +++ b/src/Pure/General/sql.scala Mon May 08 17:16:40 2017 +0200 @@ -133,7 +133,7 @@ if (body == "") error("Missing SQL body for table " + quote(name)) else SQL.enclose(body) - def query_name: Source = query + " AS " + SQL.ident(name) + def query_named: Source = query + " AS " + SQL.ident(name) def create(strict: Boolean = false, sql_type: Type.Value => Source): Source = {