#19 add support for mariadb datasource, added unit test, added constants file for database product names

Author: happenedIn

pom.xml

@@ -180,6 +180,16 @@
             <version>4.11</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.zaxxer</groupId>
+            <artifactId>HikariCP</artifactId>
+            <version>2.5.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <version>3.1.4</version>
+        </dependency>
         <dependency>
             <groupId>org.casbin</groupId>
             <artifactId>jcasbin</artifactId>

src/main/java/org/casbin/adapter/HibernateAdapter.java

@@ -1,6 +1,7 @@
 package org.casbin.adapter;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.casbin.constants.AdapterConstants;
 import org.casbin.jcasbin.model.Assertion;
 import org.casbin.jcasbin.model.Model;
 import org.casbin.jcasbin.persist.Adapter;
@@ -59,10 +60,10 @@ private void open() throws SQLException {
     private void createDatabase() {
         Session session = factory.openSession();
         Transaction tx = session.beginTransaction();
-        if (this.databaseProductName.contains("MySQL")) {
+        if (this.databaseProductName.contains(AdapterConstants.MySQL.name()) || this.databaseProductName.contains(AdapterConstants.MariaDB.name())) {
             session.createSQLQuery("CREATE DATABASE IF NOT EXISTS casbin").executeUpdate();
             session.createSQLQuery("USE casbin").executeUpdate();
-        } else if (this.databaseProductName.contains("SQLServer")) {
+        } else if (this.databaseProductName.contains(AdapterConstants.SQLServer.name())) {
             session.createSQLQuery("IF NOT EXISTS (" +
                     "SELECT * FROM sysdatabases WHERE name = 'casbin') CREATE DATABASE casbin ON PRIMARY " +
                     "( NAME = N'casbin', FILENAME = N'C:\\Program Files\\Microsoft SQL Server\\MSSQL.1\\MSSQL\\DATA\\casbinDB.mdf' , SIZE = 3072KB , MAXSIZE = UNLIMITED, FILEGROWTH = 1024KB ) " +
@@ -78,7 +79,7 @@ private void createDatabase() {
     private void createTable() {
         Session session = factory.openSession();
         Transaction tx = session.beginTransaction();
-        if (this.databaseProductName.contains("MySQL")) {
+        if (this.databaseProductName.contains(AdapterConstants.MySQL.name()) || this.databaseProductName.contains(AdapterConstants.MariaDB.name())) {
             session.createSQLQuery("CREATE TABLE IF NOT EXISTS casbin_rule (" +
                     "id INT not NULL primary key," +
                     "ptype VARCHAR(100) not NULL," +
@@ -88,7 +89,7 @@ private void createTable() {
                     "v3 VARCHAR(100)," +
                     "v4 VARCHAR(100)," +
                     "v5 VARCHAR(100))").executeUpdate();
-        } else if (this.databaseProductName.contains("Oracle")) {
+        } else if (this.databaseProductName.contains(AdapterConstants.Oracle.name())) {
             session.createSQLQuery("declare " +
                     "nCount NUMBER;" +
                     "v_sql LONG;" +
@@ -109,7 +110,7 @@ private void createTable() {
                     "execute immediate v_sql;" +
                     "END IF;" +
                     "end;").executeUpdate();
-        } else if (this.databaseProductName.contains("SQLServer")) {
+        } else if (this.databaseProductName.contains(AdapterConstants.SQLServer.name())) {
             session.createSQLQuery("if not exists (select * from sysobjects where id = object_id('casbin_rule')) " +
                     "create table  casbin_rule (" +
                     "   id int, " +
@@ -130,9 +131,9 @@ private void createTable() {
     private void dropTable() {
         Session session = factory.openSession();
         Transaction tx = session.beginTransaction();
-        if (this.databaseProductName.contains("MySQL")) {
+        if (this.databaseProductName.contains(AdapterConstants.MySQL.name()) || this.databaseProductName.contains(AdapterConstants.MariaDB.name())) {
             session.createSQLQuery("DROP TABLE IF EXISTS casbin_rule").executeUpdate();
-        } else if (this.databaseProductName.contains("Oracle")) {
+        } else if (this.databaseProductName.contains(AdapterConstants.Oracle.name())) {
             session.createSQLQuery("declare " +
                     "nCount NUMBER;" +
                     "v_sql LONG;" +
@@ -144,7 +145,7 @@ private void dropTable() {
                     "execute immediate v_sql;" +
                     "END IF;" +
                     "end;").executeUpdate();
-        } else if (this.databaseProductName.contains("SQLServer")) {
+        } else if (this.databaseProductName.contains(AdapterConstants.SQLServer.name())) {
             session.createSQLQuery("if exists (select * from sysobjects where id = object_id('casbin_rule') drop table casbin_rule").executeUpdate();
         }
         tx.commit();

src/main/java/org/casbin/constants/AdapterConstants.java

@@ -0,0 +1,9 @@
+package org.casbin.constants;
+
+public enum AdapterConstants {
+    // database product names
+    MySQL,
+    MariaDB,
+    Oracle,
+    SQLServer;
+}

src/test/java/org/casbin/test/HibernateAdapterDatasourceTest.java

@@ -0,0 +1,47 @@
+package org.casbin.test;
+
+import static org.junit.Assert.assertEquals;
+
+import java.sql.SQLException;
+
+import org.casbin.adapter.HibernateAdapter;
+import org.casbin.jcasbin.main.Enforcer;
+import org.junit.Test;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+public class HibernateAdapterDatasourceTest {
+
+    private static final String DRIVER = "org.mariadb.jdbc.Driver";
+    private static final String URL = "jdbc:mariadb://localhost:3306/casbin?serverTimezone=GMT%2B8&useSSL=false&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true";
+    private static final String USERNAME = "root";
+    private static final String PASSWORD = "casbin_test";
+    private static HikariDataSource dataSource;
+    
+
+    @Test
+    public void testInitDBfromMariaDBDatasource() throws SQLException {
+
+        HikariConfig config = new HikariConfig();
+        config.setJdbcUrl(URL);
+        config.setUsername(USERNAME);
+        config.setPassword(PASSWORD);
+        config.setDriverClassName(DRIVER);
+        config.setMaximumPoolSize(5);
+        
+        dataSource = new HikariDataSource(config);
+        Enforcer e = new Enforcer("examples/rbac_with_domains_model.conf", new HibernateAdapter(dataSource));
+
+        e.savePolicy(); //clear table
+
+        e.addPolicy("admin", "domain1", "data1", "read");
+        e.addGroupingPolicy("alice", "admin", "domain1");
+
+        testDomainEnforce(e, "alice", "domain1", "data1", "read", true);
+    }
+
+    private void testDomainEnforce(Enforcer e, String sub, String dom, String obj, String act, boolean res) {
+        assertEquals(res, e.enforce(sub, dom, obj, act));
+    }
+}