@@ -7078,40 +7078,40 @@ setkey(y)
70787078test(1483.4, y[x], data.table(country="US", key="country"))
70797079
70807080# 5361 merge on character and factor should only have key(x) if result is really sorted
7081- let = c("a", "b", "c")
7081+ lett = c("a", "b", "c")
70827082rlet = c("c", "b", "a")
70837083x = data.table(i=rlet)
7084- y = data.table(i=factor(let , levels=rlet), key="i")
7084+ y = data.table(i=factor(lett , levels=rlet), key="i")
70857085test(1483.51, x[y, on="i"], x)
70867086test(1483.52, y[x, on="i"], x)
7087- test(1483.53, merge(x, y, by="i"), data.table(i=let , key="i"))
7088- test(1483.54, merge(y, x, by="i"), data.table(i=let , key="i"))
7087+ test(1483.53, merge(x, y, by="i"), data.table(i=lett , key="i"))
7088+ test(1483.54, merge(y, x, by="i"), data.table(i=lett , key="i"))
70897089x = data.table(i1=1:3, i2=rlet)
7090- y = data.table(i1=1:3, i2=factor(let , levels=rlet), key=c("i1", "i2"))
7091- test(1483.55, x[y, on=c("i1", "i2")], data.table(i1=1:3, i2=let ))
7090+ y = data.table(i1=1:3, i2=factor(lett , levels=rlet), key=c("i1", "i2"))
7091+ test(1483.55, x[y, on=c("i1", "i2")], data.table(i1=1:3, i2=lett ))
70927092test(1483.56, y[x, on=c("i1", "i2")], x)
70937093test(1483.57, merge(x, y, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
70947094test(1483.58, merge(y, x, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
70957095
70967096x = data.table(i=rlet, key="i")
7097- y = data.table(i=factor(let , levels=rlet))
7097+ y = data.table(i=factor(lett , levels=rlet))
70987098test(1483.61, x[y, on="i"], x)
7099- test(1483.62, y[x, on="i"], data.table(i=let ))
7100- test(1483.63, merge(x, y, by="i"), data.table(i=let , key="i"))
7101- test(1483.64, merge(y, x, by="i"), data.table(i=let , key="i"))
7099+ test(1483.62, y[x, on="i"], data.table(i=lett ))
7100+ test(1483.63, merge(x, y, by="i"), data.table(i=lett , key="i"))
7101+ test(1483.64, merge(y, x, by="i"), data.table(i=lett , key="i"))
71027102x = data.table(i1=1:3, i2=rlet, key=c("i1", "i2"))
7103- y = data.table(i1=1:3, i2=factor(let , levels=rlet))
7104- test(1483.65, x[y, on=c("i1", "i2")], data.table(i1=1:3, i2=let ))
7103+ y = data.table(i1=1:3, i2=factor(lett , levels=rlet))
7104+ test(1483.65, x[y, on=c("i1", "i2")], data.table(i1=1:3, i2=lett ))
71057105test(1483.66, y[x, on=c("i1", "i2")], data.table(i1=1:3, i2=rlet))
71067106test(1483.67, merge(x, y, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
71077107test(1483.68, merge(y, x, by=c("i1", "i2")), data.table(i1=2L, i2="b", key=c("i1", "i2")))
71087108
71097109x = data.table(i=rlet, a=rlet)
7110- y = data.table(i=factor(let , levels=rlet), b=let , key="i")
7110+ y = data.table(i=factor(lett , levels=rlet), b=lett , key="i")
71117111test(1483.71, x[y, on="i"], data.table(i=rlet, a=rlet, b=rlet))
71127112test(1483.72, y[x, on="i"], data.table(i=rlet, b=rlet, a=rlet))
7113- test(1483.73, merge(x, y, by="i"), data.table(i=let , a=let , b=let , key="i"))
7114- test(1483.74, merge(y, x, by="i"), data.table(i=let , b=let , a=let , key="i"))
7113+ test(1483.73, merge(x, y, by="i"), data.table(i=lett , a=lett , b=lett , key="i"))
7114+ test(1483.74, merge(y, x, by="i"), data.table(i=lett , b=lett , a=lett , key="i"))
71157115
71167116some_letters <- c("c", "b", "a")
71177117some_more_letters <- rep(c("a", "b", "c"), 2L)
@@ -18578,8 +18578,8 @@ test(2251.15, dim(fread(text, fill=Inf)), c(9L, 9L))
1857818578
1857918579.datatable.aware = FALSE
1858018580dt = data.table(a = 1L)
18581- test(2252.1, dt[, b:=2L], error = "\\[ was called on a data.table.*not data.table-aware.*':='")
18582- test(2252.2, dt[, let(b=2L)], error = "\\[ was called on a data.table.*not data.table-aware.*'let' ")
18581+ test(2252.1, dt[, b:=2L], error = "\\[ was called on a dtest(2252.2, dt[, let(b=2L)], error = "\\[ was called on a data.table.*not data.table-aware.*'let'ata .table.*not data.table-aware.*':='")
18582+ ")
1858318583rm(.datatable.aware)
1858418584
1858518585# tests for trunc.char handling wide characters # 5096
0 commit comments