equal
deleted
inserted
replaced
1072 val columns1 = table1.columns.tail.map(_.apply(table1)) |
1072 val columns1 = table1.columns.tail.map(_.apply(table1)) |
1073 val (columns, from) = |
1073 val (columns, from) = |
1074 if (ml_statistics) { |
1074 if (ml_statistics) { |
1075 val columns = columns1 ::: List(Data.ml_statistics(table2)) |
1075 val columns = columns1 ::: List(Data.ml_statistics(table2)) |
1076 val join = |
1076 val join = |
1077 table1.toString + SQL.join_outer + table2 + " ON " + |
1077 table1.ident + SQL.join_outer + table2.ident + " ON " + |
1078 SQL.and( |
1078 SQL.and( |
1079 Data.log_name(table1).ident + " = " + Data.log_name(table2).ident, |
1079 Data.log_name(table1).ident + " = " + Data.log_name(table2).ident, |
1080 Data.session_name(table1).ident + " = " + Data.session_name(table2).ident) |
1080 Data.session_name(table1).ident + " = " + Data.session_name(table2).ident) |
1081 (columns, SQL.enclose(join)) |
1081 (columns, SQL.enclose(join)) |
1082 } |
1082 } |