Release v1.5.0

README.md

@@ -1,40 +1,40 @@
-:warning: This plugin needs the new modular driver system to work, which is available since Metabase version 0.32.
-
 # Firebird driver for metabase
 
 This driver enables metabase to connect to [FirebirdSQL](https://firebirdsql.org/) databases.
 
 ## Installation:
 
-* Make sure you have installed a recent Metabase Version that supports drivers as plugins. (>=0.32)
-* Download the [latest release](https://github.com/evosec/metabase-firebird-driver/releases/latest) of the Firebird driver or build it from source. (See below)
+* Make sure you have installed a recent Metabase Version.
+* Download the [latest release](https://github.com/evosec/metabase-firebird-driver/releases/latest) of the Firebird driver or [build it from source](#building-from-source).
 * Create the `plugins` directory if it doesn't already exist. By default that directory is next to the metabase.jar file, but you can specify a different directory by setting the environment varianble `MB_PLUGINS_DIR`. 
 * Just drop the `firebird.metabase-driver.jar` in the plugins directory. On startup, metabase will load the plugin and the driver should be available.
 
 ## Authentication issues when using Legacy_Auth
 
-The latest releases are built with version 4.x of Jaybird (the Firebird JDBC driver), [which no longer supports Legacy_Auth](https://www.firebirdsql.org/file/documentation/drivers_documentation/java/4.0.0/release_notes.html#removed-legacy_auth-from-default-authentication-plugins). 
+The latest releases are built with version 4.x of Jaybird (the Firebird JDBC driver), [which no longer supports Legacy_Auth](https://www.firebirdsql.org/file/documentation/drivers_documentation/java/4.0.0/release_notes.html#removed-legacy_auth-from-default-authentication-plugins).
 
-If you have problems accessing your database ([#14](https://github.com/evosec/metabase-firebird-driver/issues/14)) you can use the release artifact `firebird.metabase-driver_jaybird-3.jar` which is built with Jaybird 3.x.
+:warning: First of all: Legacy_Auth is disabled for a reason. You should only use the following workarounds if you have no way of using a more secure authentication method. :warning:
 
-## Building from source:
+If you really need to access your database using Legacy_Auth ([#14](https://github.com/evosec/metabase-firebird-driver/issues/14)) you can [add it to the authentication plugins](https://www.firebirdsql.org/file/documentation/drivers_documentation/java/4.0.0/release_notes.html#configure-authentication-plugins). For example:
+```
+jdbc:firebirdsql://localhost/employee?authPlugins=Legacy_Auth
+```
 
-For a detailed description, take a look at the [official documentation](https://github.com/metabase/metabase/wiki/Writing-A-Driver).
+If that does not work for you, you can use the release artifact `firebird.metabase-driver_jaybird-3.jar` which is built with Jaybird 3.x.
 
-#### Prepare a local Metabase installation for building drivers
+## Building from source:
+
+For a detailed description, take a look at the [official documentation](https://www.metabase.com/docs/latest/developers-guide/drivers/start.html).
 
-* Download the Metabase sources (>=0.32)
-* Compile a local Metabase installation for building drivers
+* Checkout the main metabase repository and the firebird driver repository in the same parent directory:
 ```
-lein install-for-building-drivers
+workspace
+  - metabase
+  - metabase-firebird-driver
 ```
-
-#### Build the driver
-
-* Checkout the Firebird driver sources to `{metabase-source-dir}/modules/drivers/firebird`
-* Build the driver. This will create the .jar file in the directory `target/uberjar`. Just copy that file to your plugins directory and you are good to go!
+* Run the `build.sh` script from the metabase-firebird-driver repository
 ```
-cd {metabase-source-dir}/modules/drivers/firebird
-lein clean
-LEIN_SNAPSHOTS_IN_RELEASE=true DEBUG=1 lein uberjar
+cd metabase-firebird-driver
+./build.sh
 ```
+* The driver will now be built. The .jar file can be found in the `target` directory.

build.sh

@@ -0,0 +1,14 @@
+# Example for building the driver with bash or similar
+
+DRIVER_PATH=`pwd`
+
+# switch to the local checkout of the Metabase repo
+cd ../metabase
+
+# get absolute path to the driver project directory
+
+clojure \
+  -Sdeps "{:aliases {:firebird {:extra-deps {evosec/firebird-driver {:local/root \"$DRIVER_PATH\"}}}}}"  \
+  -X:build:firebird \
+  build-drivers.build-driver/build-driver! \
+  "{:driver :firebird, :project-dir \"$DRIVER_PATH\", :target-dir \"$DRIVER_PATH/target\"}"

deps.edn

@@ -0,0 +1,16 @@
+{:paths
+ ["src" "resources"]
+
+
+ :deps
+ {org.firebirdsql.jdbc/jaybird {:mvn/version "4.0.9.java8"}}
+
+ ;; build the driver with clojure -X:build
+ :aliases
+ {:build
+  {:extra-deps {metabase/metabase-core {:local/root "../metabase"}
+                metabase/build-drivers {:local/root "../metabase/bin/build-drivers"}}
+   :exec-fn    build-drivers.build-driver/build-driver!
+   :exec-args  {:driver      :firebird
+                :project-dir "."
+                :target-dir  "./target"}}}}

src/metabase/driver/firebird.clj

@@ -105,7 +105,7 @@
     ;; this point.
     (.execute stmt)))
 
-(defmethod sql-jdbc.sync/have-select-privilege? :sql-jdbc
+(defmethod sql-jdbc.sync/have-select-privilege? :firebird
   [driver conn table-schema table-name]
   ;; Query completes = we have SELECT privileges
   ;; Query throws some sort of no permissions exception = no SELECT privileges