Merge branch 'main' into main

Author: quinnj

.github/workflows/TagBot.yml

@@ -4,6 +4,11 @@ on:
     types:
       - created
   workflow_dispatch:
+    inputs:
+      lookback:
+        default: 3
+permissions:
+  contents: write
 jobs:
   TagBot:
     if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
@@ -12,3 +17,4 @@ jobs:
       - uses: JuliaRegistries/TagBot@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          ssh: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/ci.yml

@@ -12,42 +12,34 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 1.0
+          - "1.6"
           - 1 # automatically expands to the latest stable 1.x release of Julia
           - nightly
         os:
           - ubuntu-latest
         arch:
           - x64
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v5
       - run: docker compose up -d
       - uses: julia-actions/setup-julia@v2
         with:
           version: ${{ matrix.version }}
           arch: ${{ matrix.arch }}
-      - uses: actions/cache@v4
-        env:
-          cache-name: cache-artifacts
-        with:
-          path: ~/.julia/artifacts
-          key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
-          restore-keys: |
-            ${{ runner.os }}-test-${{ env.cache-name }}-
-            ${{ runner.os }}-test-
-            ${{ runner.os }}-
+      - uses: julia-actions/cache@v2
       - uses: julia-actions/julia-buildpkg@v1
       - uses: julia-actions/julia-runtest@v1
       - uses: julia-actions/julia-processcoverage@v1
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v5
         with:
-          file: lcov.info
+          files: lcov.info
+          token: ${{ secrets.CODECOV_TOKEN }}
   docs:
     name: Documentation
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: julia-actions/setup-julia@v1
+      - uses: actions/checkout@v5
+      - uses: julia-actions/setup-julia@v2
         with:
           version: '1'
       - run: |

Project.toml

@@ -18,7 +18,6 @@ DBInterface = "2.5"
 DecFP = "0.4.9, 0.4.10, 1"
 MariaDB_Connector_C_jll = "3.1.12"
 Parsers = "0.3, 1, 2"
-Random = "1.11.0"
 Tables = "1"
 julia = "1.6"
 

src/MySQL.jl

@@ -130,6 +130,7 @@ function setoptions!(mysql;
         passphrase::Union{AbstractString, Nothing}=nothing,
         ssl_verify_server_cert::Union{Bool, Nothing}=nothing,
         ssl_enforce::Union{Bool, Nothing}=nothing,
+        ssl_mode::Union{API.mysql_ssl_mode, Nothing}=nothing,
         default_auth::Union{AbstractString, Nothing}=nothing,
         connection_handler::Union{AbstractString, Nothing}=nothing,
         plugin_dir::Union{AbstractString, Nothing}=nothing,
@@ -201,6 +202,9 @@ function setoptions!(mysql;
     if ssl_crlpath !== nothing
         API.setoption(mysql, API.MYSQL_OPT_SSL_CRLPATH, ssl_crlpath)
     end
+    if ssl_mode !== nothing
+        API.setoption(mysql, API.MYSQL_OPT_SSL_MODE, ssl_mode)
+    end
     if passphrase !== nothing
         API.setoption(mysql, API.MARIADB_OPT_TLS_PASSPHRASE, passphrase)
     end

src/api/consts.jl

@@ -140,6 +140,14 @@ end
     MYSQL_PROTOCOL_MEMORY
 end
 
+@enum mysql_ssl_mode begin
+    SSL_MODE_DISABLED
+    SSL_MODE_PREFERRED
+    SSL_MODE_REQUIRED
+    SSL_MODE_VERIFY_CA
+    SSL_MODE_VERIFY_IDENTITY
+end
+
 # Options to be passed to mysql_options API.
 @enum mysql_option begin
     MYSQL_OPT_CONNECT_TIMEOUT
@@ -212,9 +220,10 @@ end
     MARIADB_OPT_INTERACTIVE
     MARIADB_OPT_PROXY_HEADER
     MARIADB_OPT_IO_WAIT
+    MYSQL_OPT_SSL_MODE
 end
 
-const CUINTOPTS = Set([MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_PROTOCOL, MYSQL_OPT_READ_TIMEOUT, MYSQL_OPT_WRITE_TIMEOUT])
+const CUINTOPTS = Set([MYSQL_OPT_CONNECT_TIMEOUT, MYSQL_OPT_PROTOCOL, MYSQL_OPT_READ_TIMEOUT, MYSQL_OPT_WRITE_TIMEOUT, MYSQL_OPT_SSL_MODE])
 const CULONGOPTS = Set([MYSQL_OPT_MAX_ALLOWED_PACKET, MYSQL_OPT_NET_BUFFER_LENGTH])
 const BOOLOPTS = Set([MYSQL_ENABLE_CLEARTEXT_PLUGIN, MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, MYSQL_OPT_LOCAL_INFILE, MYSQL_OPT_RECONNECT, MYSQL_REPORT_DATA_TRUNCATION, MYSQL_OPT_SSL_ENFORCE, MYSQL_OPT_SSL_VERIFY_SERVER_CERT])
 const STRINGOPTS = Set([MYSQL_DEFAULT_AUTH, MYSQL_OPT_BIND, MYSQL_OPT_SSL_CA, MYSQL_OPT_SSL_CAPATH, MYSQL_OPT_SSL_CERT, MYSQL_OPT_SSL_CIPHER, MYSQL_OPT_SSL_CRL, MYSQL_OPT_SSL_CRLPATH, MYSQL_OPT_SSL_KEY, MYSQL_OPT_TLS_VERSION, MYSQL_PLUGIN_DIR, MYSQL_READ_DEFAULT_FILE, MYSQL_READ_DEFAULT_GROUP, MYSQL_SERVER_PUBLIC_KEY, MYSQL_SET_CHARSET_DIR, MYSQL_SET_CHARSET_NAME, MYSQL_SHARED_MEMORY_BASE_NAME])

src/load.jl

@@ -9,6 +9,7 @@ end
 
 sqltype(::Type{Union{T, Missing}}) where {T} = sqltype(T)
 sqltype(T) = get(SQLTYPES, T, "VARCHAR(255)")
+sqltype(T, coltypes, name) = get(coltypes, name, sqltype(T))
 
 const SQLTYPES = Dict{Type, String}(
     Int8 => "TINYINT",
@@ -34,27 +35,30 @@ const SQLTYPES = Dict{Type, String}(
 
 checkdupnames(names) = length(unique(map(x->lowercase(String(x)), names))) == length(names) || error("duplicate case-insensitive column names detected; sqlite doesn't allow duplicate column names and treats them case insensitive")
 
-function createtable(conn::Connection, nm::AbstractString, sch::Tables.Schema; debug::Bool=false, quoteidentifiers::Bool=true, createtableclause::AbstractString="CREATE TABLE", columnsuffix=Dict(), auto_increment_primary_key_name::AbstractString="")
+function createtable(conn::Connection, nm::AbstractString, sch::Tables.Schema; debug::Bool=false, quoteidentifiers::Bool=true, createtableclause::AbstractString="CREATE TABLE", coltypes=Dict(), columnsuffix=Dict(), auto_increment_primary_key_name::Union{Nothing,AbstractString}=nothing
     names = sch.names
     checkdupnames(names)
-    types = [sqltype(T) for T in sch.types]
+    types = [sqltype(T, coltypes, names[i]) for (i, T) in enumerate(sch.types)]
     columns = (string(quoteidentifiers ? quoteid(String(names[i])) : names[i], ' ', types[i], ' ', get(columnsuffix, names[i], "")) for i = 1:length(names))
-    auto_increment_column = isempty(auto_increment_primary_key_name) ? "" : "$(auto_increment_primary_key_name) INT AUTO_INCREMENT PRIMARY KEY, "
+    auto_increment_column = (auto_increment_primary_key_name === nothing || isempty(auto_increment_primary_key_name)) ? "" : "$(auto_increment_primary_key_name) INT AUTO_INCREMENT PRIMARY KEY, "
     debug && @info "executing create table statement: `$createtableclause $nm ($(auto_increment_column)$(join(columns, ", ")))`"
     return DBInterface.execute(conn, "$createtableclause $nm ($(auto_increment_column)$(join(columns, ", ")))")
 end
 
 """
-    MySQL.load(table, conn, name; append=true, quoteidentifiers=true, limit=typemax(Int64), createtableclause=nothing, columnsuffix=Dict(), debug=false)
-    table |> MySQL.load(conn, name; append=true, quoteidentifiers=true, limit=typemax(Int64), createtableclause=nothing, columnsuffix=Dict(), debug=false)
+    MySQL.load(table, conn, name; append=true, quoteidentifiers=true, limit=typemax(Int64), createtableclause=nothing, coltypes=Dict(), columnsuffix=Dict(), debug=false)
+    table |> MySQL.load(conn, name; append=true, quoteidentifiers=true, limit=typemax(Int64), createtableclause=nothing, coltypes=Dict(), columnsuffix=Dict(), debug=false)
 
 Attempts to take a Tables.jl source `table` and load into the database represented by `conn` with table name `name`.
 
 It first detects the `Tables.Schema` of the table source and generates a `CREATE TABLE` statement
-with the appropriate column names and types. If no table name is provided, one will be autogenerated, like `odbcjl_xxxxx`.
+with the appropriate column names and types. If no table name is provided, one will be autogenerated, like `mysql_xxxxx`.
 The `CREATE TABLE` clause can be provided manually by passing the `createtableclause` keyword argument, which
 would allow specifying a temporary table or `if not exists`.
-Column definitions can also be enhanced by providing arguments to `columnsuffix` as a `Dict` of 
+Column types can be overridden by providing the `coltypes` keyword argument as a `Dict` of
+column name (given as a `Symbol`) to a string of the SQL type. This allows, for example, using
+a `LONGBLOB` instead of `BLOB` for large binary data by doing `coltypes=Dict(:Photo => "LONGBLOB")`.
+Column definitions can also be enhanced by providing arguments to `columnsuffix` as a `Dict` of
 column name (given as a `Symbol`) to a string of the enhancement that will come after name and type like
 `[column name] [column type] enhancements`. This allows, for example, specifying the charset of a string column
 by doing something like `columnsuffix=Dict(:Name => "CHARACTER SET utf8mb4")`.

test/runtests.jl

@@ -161,6 +161,22 @@ ct0 = (x = UInt8[1, 22, 23],)
 MySQL.load(ct0,conn, debug=true)
 #there is no @test invocation here; but the above call failed due to Random not being imported
 
+# https://github.com/JuliaDatabases/MySQL.jl/issues/225
+# Test that coltypes parameter allows overriding default SQL types (e.g., BLOB -> LONGBLOB)
+ct225 = (
+    id = Int32[1, 2],
+    data = [UInt8[1, 2, 3], UInt8[4, 5, 6]],
+)
+MySQL.load(ct225, conn, "test225"; coltypes=Dict(:data => "LONGBLOB"), debug=true)
+col_info = DBInterface.execute(conn, "SHOW COLUMNS FROM test225 WHERE Field = 'data'") |> columntable
+# Type column may be returned as Vector{UInt8} or String depending on MySQL version
+col_type = col_info.Type[1]
+col_type_str = col_type isa Vector{UInt8} ? String(col_type) : col_type
+@test lowercase(col_type_str) == "longblob"
+# Also verify data roundtrips correctly
+ct225_roundtrip = DBInterface.execute(conn, "SELECT * FROM test225") |> columntable
+@test ct225_roundtrip.data == ct225.data
+
 # now test insert/parameter binding
 DBInterface.execute(conn, "DELETE FROM Employee")
 for i = 1:length(expected)