-
-
Notifications
You must be signed in to change notification settings - Fork 24
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Stick to Rails 6.1 for now, due to warbler compatibility issues with JRuby 9.4 (jruby/warbler#539) * Don't use git:// protocol in Gemfile, it won't work in the war * Upgrade MariaDB driver * Remove unecessary files from war * Fix dummy_production.key permission at runtime * Set a default secret key value * ci: add Tomcat tests Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
- Loading branch information
Showing
13 changed files
with
271 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
# frozen_string_literal: true | ||
|
||
module Jdbc | ||
module MariaDB | ||
DRIVER_VERSION = '3.0.4' | ||
|
||
def self.driver_jar | ||
File.expand_path("../../lib/mariadb-java-client-#{DRIVER_VERSION}.jar", __dir__) | ||
end | ||
|
||
def self.load_driver(method = :load) | ||
send method, driver_jar | ||
end | ||
|
||
def self.driver_name | ||
'org.mariadb.jdbc.Driver' | ||
end | ||
|
||
if defined?(JRUBY_VERSION) && # enable backwards-compat behavior : | ||
(Java::JavaLang::Boolean.get_boolean('jdbc.driver.autoload') || | ||
Java::JavaLang::Boolean.get_boolean('jdbc.mariadb.autoload') || | ||
java.lang.System.getProperty('kaui.db.adapter', ENV.fetch('KAUI_DB_ADAPTER', 'mariadb')) == 'mariadb') | ||
warn "autoloading JDBC driver on require 'jdbc/mariadb'" if $VERBOSE | ||
load_driver :require | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.