Merge delete and fixe row tests
This commit is contained in:
commit
84a3075bc8
10
solution.pl
10
solution.pl
|
@ -68,7 +68,7 @@ row(Table, Row) :-
|
||||||
length(Cols, L),
|
length(Cols, L),
|
||||||
length(Row, L),
|
length(Row, L),
|
||||||
apply(Table, Row)
|
apply(Table, Row)
|
||||||
); fail.
|
); throw("Table doesn't exist").
|
||||||
|
|
||||||
:- dynamic rows/1.
|
:- dynamic rows/1.
|
||||||
/*
|
/*
|
||||||
|
@ -153,11 +153,16 @@ prompt, but which may include selectors. Selectors are terms of the form
|
||||||
delete(Table, Conds) :-
|
delete(Table, Conds) :-
|
||||||
(tabl(Table, _) ->
|
(tabl(Table, _) ->
|
||||||
row(Table, Row),
|
row(Table, Row),
|
||||||
does_match(Conds, Table, Row)
|
does_match(Conds, Table, Row),
|
||||||
|
Term =.. [Table | Row],
|
||||||
|
retract(Term),
|
||||||
|
fail
|
||||||
;
|
;
|
||||||
throw("Table doesn't exist")
|
throw("Table doesn't exist")
|
||||||
).
|
).
|
||||||
|
|
||||||
|
delete(_, _).
|
||||||
|
|
||||||
|
|
||||||
does_match([], _, _) :- !.
|
does_match([], _, _) :- !.
|
||||||
|
|
||||||
|
@ -182,6 +187,7 @@ delete(Table, Conds) :-
|
||||||
% Check the next condition
|
% Check the next condition
|
||||||
does_match(Rest, Table, Row).
|
does_match(Rest, Table, Row).
|
||||||
|
|
||||||
|
|
||||||
:- dynamic selec/4.
|
:- dynamic selec/4.
|
||||||
/*
|
/*
|
||||||
Note that the name of this predicate is selec (without t) for the simple
|
Note that the name of this predicate is selec (without t) for the simple
|
||||||
|
|
6
tests.pl
6
tests.pl
|
@ -52,16 +52,16 @@ test(drop_inexistant, throws(_)) :-
|
||||||
drop(foobar).
|
drop(foobar).
|
||||||
|
|
||||||
% Test if row/2 returns the different rows of a given table.
|
% Test if row/2 returns the different rows of a given table.
|
||||||
test(rows, cleanup(cdrop(foo))) :-
|
test(row, cleanup(cdrop(foo))) :-
|
||||||
create_table(foo, [bar, baz]),
|
create_table(foo, [bar, baz]),
|
||||||
insert(foo, [1, 2]),
|
insert(foo, [1, 2]),
|
||||||
insert(foo, [3, 4]),
|
insert(foo, [3, 4]),
|
||||||
rows(foo, Rows),
|
row(foo, Rows),
|
||||||
assertion(length(Rows,2)).
|
assertion(length(Rows,2)).
|
||||||
|
|
||||||
% Test if row/2 fails on an unknown table name.
|
% Test if row/2 fails on an unknown table name.
|
||||||
test(row_inexistant, throws(_)) :-
|
test(row_inexistant, throws(_)) :-
|
||||||
rows(foo, _Row).
|
row(foo, _Row).
|
||||||
|
|
||||||
% Test if rows/1 works when called for a given table name.
|
% Test if rows/1 works when called for a given table name.
|
||||||
test(rows, cleanup(cdrop(foo))) :-
|
test(rows, cleanup(cdrop(foo))) :-
|
||||||
|
|
Loading…
Reference in New Issue