diff --git a/+dj/+internal/GeneralRelvar.m b/+dj/+internal/GeneralRelvar.m index 24be944b..d507a84a 100644 --- a/+dj/+internal/GeneralRelvar.m +++ b/+dj/+internal/GeneralRelvar.m @@ -390,7 +390,7 @@ function restrict(self, varargin) ret.restrict(arg) end - function ret = or(self, arg) + function ret = plus(self, arg) % the relational union operator. % % arg can be another relvar, a string condition, or a structure array of tuples. @@ -400,9 +400,9 @@ function restrict(self, varargin) % queried on its own. % % For example: - % B | C cannot be used on its own, but: - % A & (B | C) returns all tuples in A that have matching tuples in B or C. - % A - (B | C) returns all tuples in A that have no matching tuples in B or C. + % B + C cannot be used on its own, but: + % A & (B + C) returns all tuples in A that have matching tuples in B or C. + % A - (B + C) returns all tuples in A that have no matching tuples in B or C. % % Warning: % ~A does not produce a valid relation by itself. Negation is @@ -557,11 +557,6 @@ function restrict(self, varargin) 'release. Please use - instead.']); ret = self - arg; end - function ret = plus(self, arg) - warning(['The relational operator + (union) will be removed in a future ' ... - 'release. Please use | instead']); - ret = self | arg; - end function ret = show(self) % SHOW - show the relation's header information.