equal
deleted
inserted
replaced
763 val rev2 = afp_rev.getOrElse("") |
763 val rev2 = afp_rev.getOrElse("") |
764 val table = pull_date_table(afp) |
764 val table = pull_date_table(afp) |
765 |
765 |
766 val version1 = Prop.isabelle_version |
766 val version1 = Prop.isabelle_version |
767 val version2 = Prop.afp_version |
767 val version2 = Prop.afp_version |
768 val eq1 = version1(table) + " = " + SQL.string(rev) |
768 val eq1 = version1(table).toString + " = " + SQL.string(rev) |
769 val eq2 = version2(table) + " = " + SQL.string(rev2) |
769 val eq2 = version2(table).toString + " = " + SQL.string(rev2) |
770 |
770 |
771 SQL.Table("recent_pull_date", table.columns, |
771 SQL.Table("recent_pull_date", table.columns, |
772 table.select(table.columns, |
772 table.select(table.columns, |
773 "WHERE " + pull_date(afp)(table) + " > " + recent_time(days) + |
773 "WHERE " + pull_date(afp)(table) + " > " + recent_time(days) + |
774 (if (rev != "" && rev2 == "") " OR " + eq1 |
774 (if (rev != "" && rev2 == "") " OR " + eq1 |
1134 val columns1 = table1.columns.tail.map(_.apply(table1)) |
1134 val columns1 = table1.columns.tail.map(_.apply(table1)) |
1135 val (columns, from) = |
1135 val (columns, from) = |
1136 if (ml_statistics) { |
1136 if (ml_statistics) { |
1137 val columns = columns1 ::: List(Data.ml_statistics(table2)) |
1137 val columns = columns1 ::: List(Data.ml_statistics(table2)) |
1138 val join = |
1138 val join = |
1139 table1 + SQL.join_outer + table2 + " ON " + |
1139 table1.toString + SQL.join_outer + table2 + " ON " + |
1140 Data.log_name(table1) + " = " + Data.log_name(table2) + " AND " + |
1140 Data.log_name(table1) + " = " + Data.log_name(table2) + " AND " + |
1141 Data.session_name(table1) + " = " + Data.session_name(table2) |
1141 Data.session_name(table1) + " = " + Data.session_name(table2) |
1142 (columns, SQL.enclose(join)) |
1142 (columns, SQL.enclose(join)) |
1143 } |
1143 } |
1144 else (columns1, table1.ident) |
1144 else (columns1, table1.ident) |