Skip to content

Commit a249dbf

Browse files
quinnjquinnj
authored
Updates (#230)
* Switch use from WeakRefStringArray to StringVector * Update Project.toml
1 parent d322258 commit a249dbf

File tree

10 files changed

+126
-101
lines changed

10 files changed

+126
-101
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ os:
1515
- linux
1616

1717
julia:
18-
- 0.7
18+
- 1.0
1919
- nightly
2020

2121
env:

‎Project.toml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name = "ODBC"
2+
uuid = "be6f12e9-ca4f-5eb2-a339-a4f995cc0291"
3+
version = "0.8.2"
4+
5+
[deps]
6+
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
7+
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
8+
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
9+
DecFP = "55939f99-70c6-5e9b-8bb0-5071ed7d61fd"
10+
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
11+
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
12+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
13+
Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
14+
WeakRefStrings = "ea10d353-3f73-51f8-a26c-33c1cb351aa5"
15+
16+
[compat]
17+
CSV = "0.4,0.5"
18+
CategoricalArrays = "0.4,0.5"
19+
DataFrames = "0.17,0.18"
20+
DecFP = "0.4"
21+
SQLite = "0.7,0.8"
22+
WeakRefStrings = "0.5,0.6"
23+
julia = "1"
24+
25+
[extras]
26+
CSV = "336ed68f-0bac-5ca0-87d4-7b16caf5d00b"
27+
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
28+
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
29+
SQLite = "0aa819cd-b072-5ff4-a722-6bc24af294d9"
30+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
31+
32+
[targets]
33+
test = ["CSV", "Dates", "SQLite", "Test", "Random"]

‎REQUIRE‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
environment:
22
matrix:
3-
- julia_version: 0.7
3+
- julia_version: 1.0
44
- julia_version: latest
55

66
platform:

‎src/API.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ const SQL_PARAM_INPUT_OUTPUT = Int16(2)
517517
#const SQL_PARAM_OUTPUT_STREAM = Int16()
518518
#Status:
519519
"http://msdn.microsoft.com/en-us/library/windows/desktop/ms710963(v=vs.85).aspx"
520-
function SQLBindParameter(stmt::Ptr{Cvoid},x::Int,iotype::Int16,ctype::Int16,sqltype::Int16,column_size::Int,decimal_digits::Int,param_value,param_size::Int,len::Ref{SQLLEN})
520+
function SQLBindParameter(stmt::Ptr{Cvoid},x::Int,iotype::Int16,ctype::Int16,sqltype::Int16,column_size::Int,decimal_digits::Int,param_value,param_size::Int,len::Ptr{SQLLEN})
521521
@odbc(:SQLBindParameter,
522522
(Ptr{Cvoid},UInt16,Int16,Int16,Int16,UInt,Int16,Ptr{Cvoid},Int,Ptr{SQLLEN}),
523523
stmt,x,iotype,ctype,sqltype,column_size,decimal_digits,param_value,param_size,len)

‎src/ODBC.jl‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function ODBCError(handle::Ptr{Cvoid}, handletype::Int16)
4949
return true
5050
end
5151

52-
#Macros to to check if a function returned a success value or not
52+
# Macros to to check if a function returned a success value or not
5353
macro CHECK(handle, handletype, func)
5454
str = string(func)
5555
esc(quote
@@ -60,9 +60,6 @@ macro CHECK(handle, handletype, func)
6060
end)
6161
end
6262

63-
Base.@deprecate listdrivers ODBC.drivers
64-
Base.@deprecate listdsns ODBC.dsns
65-
6663
"List ODBC drivers that have been installed and registered"
6764
function drivers()
6865
descriptions = String[]
@@ -200,23 +197,24 @@ end
200197
function execute!(statement::Statement, values)
201198
stmt = statement.stmt
202199
values2 = Any[cast(x) for x in values]
203-
pointers = Ptr[]
204-
types = map(typeof, values2)
200+
strlens = zeros(API.SQLLEN, length(values2))
205201
for (i, v) in enumerate(values2)
206202
if ismissing(v)
203+
strlens[i] = API.SQL_NULL_DATA
207204
@CHECK stmt API.SQL_HANDLE_STMT API.SQLBindParameter(stmt, i, API.SQL_PARAM_INPUT,
208-
API.SQL_C_CHAR, API.SQL_CHAR, 0, 0, C_NULL, 0, Ref(API.SQL_NULL_DATA))
205+
API.SQL_C_CHAR, API.SQL_CHAR, 0, 0, C_NULL, 0, pointer(strlens, i))
209206
else
210-
ctype, sqltype = API.julia2C[types[i]], API.julia2SQL[types[i]]
207+
T = typeof(v)
208+
ctype, sqltype = API.julia2C[T], API.julia2SQL[T]
211209
csize, len, dgts = sqllength(v), clength(v), digits(v)
212-
ptr = getpointer(types[i], values2, i)
210+
strlens[i] = len
211+
ptr = getpointer(T, values2, i)
213212
# println("ctype: $ctype, sqltype: $sqltype, digits: $dgts, len: $len, csize: $csize")
214-
push!(pointers, ptr)
215213
@CHECK stmt API.SQL_HANDLE_STMT API.SQLBindParameter(stmt, i, API.SQL_PARAM_INPUT,
216-
ctype, sqltype, csize, dgts, ptr, len, Ref(len))
214+
ctype, sqltype, csize, dgts, ptr, len, pointer(strlens, i))
217215
end
218216
end
219-
execute!(statement)
217+
GC.@preserve values2 strlens execute!(statement)
220218
return
221219
end
222220

‎src/Query.jl‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,29 +114,29 @@ cast(x::Dates.DateTime) = API.SQLTimestamp(x)
114114
cast(x::String) = WeakRefString(pointer(x), sizeof(x))
115115

116116
getpointer(::Type{T}, A, i) where {T} = unsafe_load(Ptr{Ptr{Cvoid}}(pointer(A, i)))
117-
getpointer(::Type{WeakRefString{T}}, A, i) where {T} = convert(Ptr{Cvoid}, A[i].ptr)
118-
getpointer(::Type{String}, A, i) = convert(Ptr{Cvoid}, pointer(Vector{UInt8}(A[i])))
117+
getpointer(::Type{WeakRefString{T}}, A, i) where {T} = A[i].ptr
118+
getpointer(::Type{String}, A, i) = pointer(A[i])
119119

120120
sqllength(x) = 1
121-
sqllength(x::AbstractString) = length(x)
121+
sqllength(x::AbstractString) = sizeof(x)
122122
sqllength(x::Vector{UInt8}) = length(x)
123-
sqllength(x::WeakRefString) = x.len
123+
sqllength(x::WeakRefString{T}) where {T} = codeunits2bytes(T, x.len)
124124
sqllength(x::API.SQLDate) = 10
125-
sqllength(x::Union{API.SQLTime,API.SQLTimestamp}) = length(string(x))
125+
sqllength(x::Union{API.SQLTime,API.SQLTimestamp}) = sizeof(string(x))
126126

127127
clength(x) = 1
128-
clength(x::AbstractString) = length(x)
128+
clength(x::AbstractString) = sizeof(x)
129129
clength(x::Vector{UInt8}) = length(x)
130130
clength(x::WeakRefString{T}) where {T} = codeunits2bytes(T, x.len)
131-
clength(x::CategoricalArrays.CategoricalValue) = length(String(x))
131+
clength(x::CategoricalArrays.CategoricalValue) = sizeof(String(x))
132132
clength(x::Missing) = API.SQL_NULL_DATA
133133

134134
digits(x) = 0
135135
digits(x::API.SQLTimestamp) = length(string(x.fraction * 1000000))
136136

137137
# primitive types
138138
allocate(::Type{T}) where {T} = Vector{T}(undef, 0)
139-
allocate(::Type{Union{Missing, WeakRefString{T}}}) where {T} = WeakRefStringArray(UInt8[], Union{Missing, WeakRefString{T}}, 0)
139+
allocate(::Type{Union{Missing, WeakRefString{T}}}) where {T} = StringVector{String}(undef, 0)
140140

141141
internal_allocate(::Type{T}, rowset, size) where {T} = Vector{T}(undef, rowset), sizeof(T)
142142
# string/binary types

‎test/mssql.jl‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -155,43 +155,43 @@
155155
@test data[1][1] === Int64(1)
156156
@test data[1][2] === Int64(2)
157157

158-
@testset "Streaming mssql data to CSV" begin
159-
# Test exporting test1 to CSV
160-
temp_filename = "mssql_test1.csv"
161-
source = ODBC.Query(dsn, "select * from test1")
162-
CSV.write(temp_filename, source)
158+
# @testset "Streaming mssql data to CSV" begin
159+
# # Test exporting test1 to CSV
160+
# temp_filename = "mssql_test1.csv"
161+
# source = ODBC.Query(dsn, "select * from test1")
162+
# CSV.write(temp_filename, source)
163163

164-
open(temp_filename) do f
165-
@test readline(f) == (
166-
"test_bigint,test_bit,test_decimal,test_int,test_money,test_numeric," *
167-
"test_smallint,test_smallmoney,test_tiny_int,test_float,test_real," *
168-
"test_date,test_datetime2,test_datetime,test_datetimeoffset," *
169-
"test_smalldatetime,test_time,test_char,test_varchar,test_nchar," *
170-
"test_nvarchar,test_binary,test_varbinary"
171-
)
172-
@test readline(f) == (
173-
"1,1,1.0,1,1.0,1.0,1,1.0,1,1.2,1.2,2016-01-01,2016-01-01T01:01:01," *
174-
"2016-01-01T01:01:01,2016-01-01T00:01:01,2016-01-01T01:01:00," *
175-
"01:01:01,A,hey there sailor,B,hey there sally,\"UInt8[0xe2, 0x40]\"," *
176-
"\"UInt8[0x00, 0x01, 0xe2, 0x40]\""
177-
)
178-
@test readline(f) == (
179-
"2,1,2.0,2,2.0,2.0,2,2.0,2,2.2,2.2,2016-01-01,2016-01-01T01:01:01," *
180-
"2016-01-01T01:01:01,2016-01-01T00:01:01,2016-01-01T01:01:00," *
181-
"01:01:01,A,hey there sailor,B,hey there sally,\"UInt8[0xe2, 0x40]\"," *
182-
"\"UInt8[0x00, 0x01, 0xe2, 0x40]\""
183-
)
184-
end
185-
rm(temp_filename)
186-
end
164+
# open(temp_filename) do f
165+
# @test readline(f) == (
166+
# "test_bigint,test_bit,test_decimal,test_int,test_money,test_numeric," *
167+
# "test_smallint,test_smallmoney,test_tiny_int,test_float,test_real," *
168+
# "test_date,test_datetime2,test_datetime,test_datetimeoffset," *
169+
# "test_smalldatetime,test_time,test_char,test_varchar,test_nchar," *
170+
# "test_nvarchar,test_binary,test_varbinary"
171+
# )
172+
# @test readline(f) == (
173+
# "1,1,1.0,1,1.0,1.0,1,1.0,1,1.2,1.2,2016-01-01,2016-01-01T01:01:01," *
174+
# "2016-01-01T01:01:01,2016-01-01T00:01:01,2016-01-01T01:01:00," *
175+
# "01:01:01,A,hey there sailor,B,hey there sally,\"UInt8[0xe2, 0x40]\"," *
176+
# "\"UInt8[0x00, 0x01, 0xe2, 0x40]\""
177+
# )
178+
# @test readline(f) == (
179+
# "2,1,2.0,2,2.0,2.0,2,2.0,2,2.2,2.2,2016-01-01,2016-01-01T01:01:01," *
180+
# "2016-01-01T01:01:01,2016-01-01T00:01:01,2016-01-01T01:01:00," *
181+
# "01:01:01,A,hey there sailor,B,hey there sally,\"UInt8[0xe2, 0x40]\"," *
182+
# "\"UInt8[0x00, 0x01, 0xe2, 0x40]\""
183+
# )
184+
# end
185+
# rm(temp_filename)
186+
# end
187187

188188
@testset "Exporting mssql data to SQLite" begin
189189
# Test exporting test1 to SQLite
190190
db = SQLite.DB()
191191
source = ODBC.Query(dsn, "select * from test1")
192192
SQLite.load!(source, db, "mssql_test1")
193193

194-
data = SQLite.query(db, "select * from mssql_test1")
194+
data = SQLite.Query(db, "select * from mssql_test1") |> DataFrame
195195
@test size(data) == (2,23)
196196
@test data[1][1] === 1
197197
@test data[10][1] === 1.2

‎test/mysql.jl‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -171,38 +171,38 @@
171171
@test data[1][1] === Int64(1)
172172
@test data[1][2] === Int64(2)
173173

174-
@testset "Streaming mysql data to CSV" begin
175-
# Test exporting test1 to CSV
176-
temp_filename = "mysql_test1.csv"
177-
source = ODBC.Query(dsn, "select * from test1")
178-
CSV.write(temp_filename, source)
174+
# @testset "Streaming mysql data to CSV" begin
175+
# # Test exporting test1 to CSV
176+
# temp_filename = "mysql_test1.csv"
177+
# source = ODBC.Query(dsn, "select * from test1")
178+
# CSV.write(temp_filename, source)
179179

180-
open(temp_filename) do f
181-
@test readline(f) == (
182-
"test_bigint,test_bit,test_decimal,test_int,test_numeric," *
183-
"test_smallint,test_mediumint,test_tiny_int,test_float,test_real," *
184-
"test_date,test_datetime,test_timestamp,test_time,test_year," *
185-
"test_char,test_varchar,test_binary,test_varbinary,test_tinyblob," *
186-
"test_blob,test_mediumblob,test_longblob,test_tinytext,test_text," *
187-
"test_mediumtext,test_longtext"
188-
)
189-
@test readline(f) == (
190-
"1,1,1.0,1,1.0,1,1,1,1.2,1.2,2016-01-01,2016-01-01T01:01:01,2016-01-01T01:01:01,01:01:01,2016,A,hey there sailor,\"UInt8[0x31, 0x32]\",,\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x62, 0x69, 0x6c, 0x6c]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x63, 0x68, 0x61, 0x72, 0x6c, 0x69, 0x65]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x64, 0x61, 0x6e]\",hey there ephraim,hey there frank,hey there george,hey there hank"
191-
)
192-
@test readline(f) == (
193-
"2,1,2.0,2,2.0,2,2,2,2.2,2.2,2016-01-01,2016-01-01T01:01:01,2016-01-01T01:01:01,01:01:01,2016,B,hey there sailor,\"UInt8[0x31, 0x32]\",,\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x32]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x62, 0x69, 0x6c, 0x6c, 0x32]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x63, 0x68, 0x61, 0x72, 0x6c, 0x69, 0x65, 0x32]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x64, 0x61, 0x6e, 0x32]\",hey there ephraim2,hey there frank2,hey there george2,hey there hank2"
194-
)
195-
end
196-
rm(temp_filename)
197-
end
180+
# open(temp_filename) do f
181+
# @test readline(f) == (
182+
# "test_bigint,test_bit,test_decimal,test_int,test_numeric," *
183+
# "test_smallint,test_mediumint,test_tiny_int,test_float,test_real," *
184+
# "test_date,test_datetime,test_timestamp,test_time,test_year," *
185+
# "test_char,test_varchar,test_binary,test_varbinary,test_tinyblob," *
186+
# "test_blob,test_mediumblob,test_longblob,test_tinytext,test_text," *
187+
# "test_mediumtext,test_longtext"
188+
# )
189+
# @test readline(f) == (
190+
# "1,1,1.0,1,1.0,1,1,1,1.2,1.2,2016-01-01,2016-01-01T01:01:01,2016-01-01T01:01:01,01:01:01,2016,A,hey there sailor,\"UInt8[0x31, 0x32]\",,\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x62, 0x69, 0x6c, 0x6c]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x63, 0x68, 0x61, 0x72, 0x6c, 0x69, 0x65]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x64, 0x61, 0x6e]\",hey there ephraim,hey there frank,hey there george,hey there hank"
191+
# )
192+
# @test readline(f) == (
193+
# "2,1,2.0,2,2.0,2,2,2,2.2,2.2,2016-01-01,2016-01-01T01:01:01,2016-01-01T01:01:01,01:01:01,2016,B,hey there sailor,\"UInt8[0x31, 0x32]\",,\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x61, 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x32]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x62, 0x69, 0x6c, 0x6c, 0x32]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x63, 0x68, 0x61, 0x72, 0x6c, 0x69, 0x65, 0x32]\",\"UInt8[0x68, 0x65, 0x79, 0x20, 0x74, 0x68, 0x65, 0x72, 0x65, 0x20, 0x64, 0x61, 0x6e, 0x32]\",hey there ephraim2,hey there frank2,hey there george2,hey there hank2"
194+
# )
195+
# end
196+
# rm(temp_filename)
197+
# end
198198

199199
@testset "Exporting mysql data to SQLite" begin
200200
# Test exporting test1 to SQLite
201201
db = SQLite.DB()
202202
source = ODBC.Query(dsn, "select * from test1")
203203
SQLite.load!(source, db, "mysql_test1")
204204

205-
data = SQLite.query(db, "select * from mysql_test1")
205+
data = SQLite.Query(db, "select * from mysql_test1") |> DataFrame
206206
@test size(data) == (2,27)
207207
@test data[1][1] === 1
208208
@test data[10][1] === 1.2

‎test/postgresql.jl‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -74,33 +74,33 @@
7474
show(data)
7575
println()
7676

77-
@testset "Streaming postgres data to CSV" begin
78-
# Test exporting test1 to CSV
79-
temp_filename = "postgres_test1.csv"
80-
source = ODBC.Query(dsn, "select * from test1")
81-
CSV.write(temp_filename, source)
77+
# @testset "Streaming postgres data to CSV" begin
78+
# # Test exporting test1 to CSV
79+
# temp_filename = "postgres_test1.csv"
80+
# source = ODBC.Query(dsn, "select * from test1")
81+
# CSV.write(temp_filename, source)
8282

83-
open(temp_filename) do f
84-
@test readline(f) == (
85-
"test_bigint,test_decimal,test_int,test_numeric,test_smallint," *
86-
"test_float,test_real,test_money,test_date,test_timestamp,test_time," *
87-
"test_char,test_varchar,test_bytea,test_boolean,test_text,test_array"
88-
)
89-
@test readline(f) == (
90-
"1,1.2,2,1.4,3,1.6,1.8,2.0,2016-01-01,2016-01-01T01:01:01,01:01:01," *
91-
"A,hey there sailor,,1,hey there abraham,\"{1,2,3}\""
92-
)
93-
end
94-
rm(temp_filename)
95-
end
83+
# open(temp_filename) do f
84+
# @test readline(f) == (
85+
# "test_bigint,test_decimal,test_int,test_numeric,test_smallint," *
86+
# "test_float,test_real,test_money,test_date,test_timestamp,test_time," *
87+
# "test_char,test_varchar,test_bytea,test_boolean,test_text,test_array"
88+
# )
89+
# @test readline(f) == (
90+
# "1,1.2,2,1.4,3,1.6,1.8,2.0,2016-01-01,2016-01-01T01:01:01,01:01:01," *
91+
# "A,hey there sailor,,1,hey there abraham,\"{1,2,3}\""
92+
# )
93+
# end
94+
# rm(temp_filename)
95+
# end
9696

9797
@testset "Exporting postgres data to SQLite" begin
9898
# Test exporting test1 to SQLite
9999
db = SQLite.DB()
100100
source = ODBC.Query(dsn, "select * from test1")
101101
SQLite.load!(source, db, "postgres_test1")
102102

103-
data = SQLite.query(db, "select * from postgres_test1")
103+
data = SQLite.Query(db, "select * from postgres_test1") |> DataFrame
104104
@test size(data) == (1,17)
105105
@test data[1][1] === 1
106106
@test data[2][1] === 1.2

0 commit comments

Comments
 (0)