Fixed some test bugs and finished a rename in SQLite.jl

Author: quinnj

src/SQLite.jl

@@ -73,7 +73,7 @@ function query(q::String,conn::SQLiteDB=sqlitedb)
 	r == SQLITE_DONE && return DataFrame("No Rows Returned")
 	#get resultset metadata: column count, column types, and column names
 	ncols = SQLite.sqlite3_column_count(stmt)
-	colnames = Array(ASCIIString,ncols)
+	colnames = Array(UTF8String,ncols)
 	resultset = Array(Any,ncols)
 	check = 0
 	for i = 1:ncols
@@ -173,7 +173,7 @@ function df2table(df::DataFrame,conn::SQLiteDB,name::String)
                 SQLite.sqlite3_bind_double(stmt,col,d)
             elseif t <: Integer
                 WORD_SIZE == 64 ? sqlite3_bind_int64(stmt,col,d) : sqlite3_bind_int(stmt,col,d)
-            elseif <: NAtype
+            elseif t <: NAtype
                 sqlite3_bind_null(stmt,col)
             else
                 sqlite3_bind_text(stmt,col,string(d),length(string(d)),C_NULL)

test/test.jl

@@ -1,30 +1,29 @@
 
 using SQLite
-co = SQLite.connect(Pkg.dir() * "/SQLite/test/Chinook_SQLite.sqlite")
+co = connect(Pkg.dir() * "/SQLite/test/Chinook_SQLite.sqlite")
 
-df = SQLite.query("SELECT * FROM Employee;")
-SQLite.createtable(df; name="test")
-SQLite.query("select * from test")
-SQLite.query("drop table test")
+df = query("SELECT * FROM Employee;")
+createtable(df; name="test")
+query("select * from test")
+droptable("test")
 
-SQLite.query("SELECT * FROM sqlite_master WHERE type='table' ORDER BY name;")
-SQLite.query("SELECT * FROM Album;")
-SQLite.query("SELECT * 
+query("SELECT * FROM sqlite_master WHERE type='table' ORDER BY name;")
+query("SELECT * FROM Album;")
+query("SELECT a.*, b.AlbumId 
 	FROM Artist a 
 	LEFT OUTER JOIN Album b ON b.ArtistId = a.ArtistId 
 	ORDER BY name;")
 
 using DataFrames
 df2 = DataFrame(ones(1000000,5))
-@time SQLite.createtable(df2;name="test2")
-@time SQLite.query("SELECT * FROM test2;")
-SQLite.droptable("test2")
+@time createtable(df2;name="test2")
+@time query("SELECT * FROM test2;")
+droptable("test2")
 
-using DataFrames
 df3 = DataFrame(ones(1000,5))
-sqldf("select * from df3")
+@time sqldf("select * from df3")
 
-# SQLite.droptable("sales")
-@time SQLite.readdlmsql(Pkg.dir() * "/SQLite/test/sales.csv";sql="select * from sales",name="sales")
 
-@time SQLite.query("select typeof(f_year), typeof(base_lines), typeof(dollars) from sales")
+@time readdlmsql(Pkg.dir() * "/SQLite/test/sales.csv";sql="select * from sales",name="sales")
+@time query("select typeof(f_year), typeof(base_lines), typeof(dollars) from sales")
+droptable("sales")