Repair the connection with MYSQL

gama-platform · May 8, 2022 · 46c3113 · 46c3113
1 parent 9adbe93
commit 46c3113
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/irit.gaml.extensions.database/.classpath b/irit.gaml.extensions.database/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
@@ -14,5 +14,6 @@
 	</classpathentry>
 	<classpathentry exported="true" kind="lib" path="lib/olap4j 1.2.0/jars/olap4j-1.2.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/olap4j 1.2.0/jars/olap4j-xmla-1.2.0.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-8.0.27.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/irit.gaml.extensions.database/META-INF/MANIFEST.MF b/irit.gaml.extensions.database/META-INF/MANIFEST.MF
@@ -15,5 +15,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Bundle-Activator: msi.gama.database.Activator
 Automatic-Module-Name: irit.gaml.extensions.database
-Bundle-ClassPath: ., lib/olap4j 1.2.0/jars/olap4j-1.2.0.jar,
- lib/olap4j 1.2.0/jars/olap4j-xmla-1.2.0.jar
+Bundle-ClassPath: .,
+ lib/olap4j 1.2.0/jars/olap4j-1.2.0.jar,
+ lib/olap4j 1.2.0/jars/olap4j-xmla-1.2.0.jar,
+ lib/mysql-connector-java-8.0.27.jar
diff --git a/irit.gaml.extensions.database/build.properties b/irit.gaml.extensions.database/build.properties
@@ -6,4 +6,5 @@ bin.includes = META-INF/,\
                plugin.xml,\
                lib/olap4j 1.2.0/jars/olap4j-1.2.0.jar,\
                lib/olap4j 1.2.0/jars/olap4j-xmla-1.2.0.jar,\
-               models/
+               models/,\
+               lib/mysql-connector-java-8.0.27.jar
diff --git a/irit.gaml.extensions.database/lib/mysql-connector-java-8.0.27.jar b/irit.gaml.extensions.database/lib/mysql-connector-java-8.0.27.jar
diff --git a/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlConnection.java b/irit.gaml.extensions.database/src/msi/gama/database/sql/SqlConnection.java
@@ -98,7 +98,7 @@ public abstract class SqlConnection {
 	static final String NULLVALUE = "NULL";
 
 	/** The Constant MYSQLDriver. */
-	static final String MYSQLDriver = "com.mysql.jdbc.Driver";
+	static final String MYSQLDriver = "com.mysql.cj.jdbc.Driver";
 
 	/** The Constant MSSQLDriver. */
 	static final String MSSQLDriver = "net.sourceforge.jtds.jdbc.Driver";