Skip to content

Commit 099fe8c

Browse files
committed
Get rid of override warnings when running tests and creating multiple databases
1 parent 51c70ca commit 099fe8c

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

src/SQLite.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ type DB
4141
function DB(f::AbstractString)
4242
handle = Ref{Ptr{Void}}()
4343
f = isempty(f) ? f : expanduser(f)
44-
if @OK sqliteopen(f,handle)
45-
db = new(f,handle[],0)
46-
register(db, regexp, nargs=2, name="regexp")
44+
if @OK sqliteopen(f, handle)
45+
db = new(f, handle[], 0)
4746
finalizer(db, _close)
4847
return db
4948
else # error

src/UDF.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,9 @@ function register(db, func::Function; nargs::Int=-1, name::AbstractString=string
209209
end
210210

211211
# as above but for aggregate functions
212+
newidentity() = @eval x->x
212213
function register(
213-
db, init, step::Function, final::Function=identity;
214+
db, init, step::Function, final::Function= newidentity;
214215
nargs::Int=-1, name::AbstractString=string(step), isdeterm::Bool=true
215216
)
216217
@assert nargs <= 127 "use -1 if > 127 arguments are needed"

test/runtests.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ using Base.Test, DataStreams, DataFrames, NullableArrays, WeakRefStrings
33

44
import Base: +, ==
55

6-
a = SQLite.DB()
7-
8-
temp = tempname()
9-
SQLite.DB(temp)
10-
116
dbfile = joinpath(dirname(@__FILE__),"Chinook_Sqlite.sqlite")
127
dbfile2 = joinpath(dirname(@__FILE__),"test.sqlite")
138
# dbfile = joinpath(Pkg.dir("SQLite"),"test/Chinook_Sqlite.sqlite")
@@ -163,6 +158,7 @@ r = SQLite.query(db, "SELECT * FROM temp WHERE AlbumId = 0")
163158
@test r[1,3] === Nullable(0)
164159
SQLite.drop!(db, "temp")
165160

161+
register(db, SQLite.regexp, nargs=2, name="regexp")
166162
r = SQLite.query(db, SQLite.@sr_str("SELECT LastName FROM Employee WHERE BirthDate REGEXP '^\\d{4}-08'"))
167163
@test get(r.columns[1][1]) == "Peacock"
168164

0 commit comments

Comments
 (0)