Author: gk Date: Thu Sep 21 13:09:34 2023 New Revision: 1912458 URL: http://svn.apache.org/viewvc?rev=1912458&view=rev Log: - Include MariaDb alias, Driver class for MariaDB v3 and map to MysqlAdapter to allow jdbc:mariadb connection url and database configuration.
Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java db/torque/trunk/torque-runtime/src/test/resources/Torque.properties db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties Modified: db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java?rev=1912458&r1=1912457&r2=1912458&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java (original) +++ db/torque/trunk/torque-runtime/src/main/java/org/apache/torque/adapter/AdapterFactory.java Thu Sep 21 13:09:34 2023 @@ -65,6 +65,7 @@ public final class AdapterFactory adapters.put("com.jnetdirect.jsql.JSQLDriver", MssqlAdapter.class); adapters.put("org.gjt.mm.mysql.Driver", MysqlAdapter.class); adapters.put("com.mysql.cj.jdbc.Driver", MysqlAdapter.class); + adapters.put("org.mariadb.jdbc.Driver", MysqlAdapter.class); adapters.put("oracle.jdbc.driver.OracleDriver", OracleAdapter.class); adapters.put("org.postgresql.Driver", PostgresAdapter.class); @@ -75,6 +76,7 @@ public final class AdapterFactory adapters.put("hsqldb", HsqldbAdapter.class); adapters.put("mssql", MssqlAdapter.class); adapters.put("mysql", MysqlAdapter.class); + adapters.put("mariadb", MysqlAdapter.class); adapters.put("oracle", OracleAdapter.class); adapters.put("postgresql", PostgresAdapter.class); adapters.put("derby", DerbyAdapter.class); @@ -87,6 +89,7 @@ public final class AdapterFactory adapters.put("Oracle", OracleAdapter.class); adapters.put("PostgreSQL", PostgresAdapter.class); adapters.put("Apache Derby", DerbyAdapter.class); + adapters.put("MariaDB", DerbyAdapter.class); adapters.put("", NoneAdapter.class); } Modified: db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java?rev=1912458&r1=1912457&r2=1912458&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java (original) +++ db/torque/trunk/torque-runtime/src/test/java/org/apache/torque/sql/SqlBuilderTest.java Thu Sep 21 13:09:34 2023 @@ -40,6 +40,7 @@ import org.apache.torque.criteria.Prepar import org.apache.torque.criteria.SqlEnum; import org.apache.torque.om.NumberKey; import org.apache.torque.util.functions.Count; +import org.junit.jupiter.api.Test; /** * Tests for SqlExpression @@ -1518,7 +1519,7 @@ public class SqlBuilderTest extends Base + "LIMIT 18446744073709551615 OFFSET 10", query.toString()); } - + @Test public void testLimitOffsetMysql() throws Exception { Criteria criteria = new Criteria(); Modified: db/torque/trunk/torque-runtime/src/test/resources/Torque.properties URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/resources/Torque.properties?rev=1912458&r1=1912457&r2=1912458&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/resources/Torque.properties (original) +++ db/torque/trunk/torque-runtime/src/test/resources/Torque.properties Thu Sep 21 13:09:34 2023 @@ -27,6 +27,20 @@ torque.dsfactory.postgresql.factory= org torque.database.oracle.adapter=oracle torque.dsfactory.oracle.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory +# +# mariadb example assigning to mysql adapter or +# +#torque.dsfactory.mydb.connection.driver = org.mariadb.jdbc.Driver +#torque.dsfactory.mydb.connection.url = jdbc:mariadb://host:port/mydb +#torque.database.mydb.adapter=mysql +#torque.dsfactory.mydb.factory= org.apache.torque.dsfactory.SharedPool2DataSourceFactory +# +# or use jndi in containers tomcat /META-INF/context.xml or WEB-INF/jetty-env.xml and set here +#torque.dsfactory.mydb.factory=org.apache.torque.dsfactory.JndiDataSourceFactory +#torque.dsfactory.mydb.jndi.path=java:comp/env/jdbc/mydb +#torque.dsfactory.mydb.jndi.ttl=300000 + + torque.idbroker.prefetch=false Modified: db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties URL: http://svn.apache.org/viewvc/db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties?rev=1912458&r1=1912457&r2=1912458&view=diff ============================================================================== --- db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties (original) +++ db/torque/trunk/torque-runtime/src/test/resources/torque-schematest.properties Thu Sep 21 13:09:34 2023 @@ -34,7 +34,6 @@ torque.dsfactory.oracle.factory= org.apa torque.database.oracle.schema=orschema - torque.idbroker.prefetch=false torque.defaults.schema = defaultschema --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscr...@db.apache.org For additional commands, e-mail: torque-dev-h...@db.apache.org