Use the same db schema in all examples (demo)

Author: alejandro-du

jdbc/mariadb-pool/README.md

@@ -23,12 +23,12 @@ Change `Service` constructor to use a `MariaDbPoolDataSource` and run the app ag
 Prepare the database:
 
 ```sql
-CREATE DATABASE jdbc_demo;
+CREATE DATABASE demo;
 CREATE USER 'user'@'%';
-GRANT ALL ON jdbc_demo.* TO 'user'@'%' IDENTIFIED BY 'password';
+GRANT ALL ON demo.* TO 'user'@'%' IDENTIFIED BY 'password';
 FLUSH PRIVILEGES;
 
-USE jdbc_demo;
+USE demo;
 CREATE TABLE programming_language(
     name VARCHAR(50) NOT NULL UNIQUE,
     rating INT

jdbc/mariadb-pool/pom.xml

@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>2.7.4</version>
+			<version>3.1.2</version>
 		</dependency>
 	</dependencies>
 

jdbc/mariadb-pool/src/main/java/com/example/Service.java

@@ -41,15 +41,15 @@ private Service() throws SQLException {
 		 * MariaDbPoolDataSource dataSource = new MariaDbPoolDataSource();
 		 * That should work!
 		 */
-		dataSource.setUrl("jdbc:mariadb://localhost:3306/jdbc_demo");
+		dataSource.setUrl("jdbc:mariadb://localhost:3306/demo");
 		dataSource.setUser("user");
 		dataSource.setPassword("password");
 		this.dataSource = dataSource;
 		/*
 		 * If you are using MariaDB SkySQL (https://mariadb.com/products/skysql),
 		 * enable SSL and specify the path to the CA chain file that you can download
 		 * from the SkySQL Portal (https://cloud.mariadb.com):
-		 * jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/jdbc_demo?useSsl=true&
+		 * jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/demo?useSsl=true&
 		 * serverSslCert=/path/to/your/skysql_chain.pem
 		 */
 	}

jdbc/part1/README.md

@@ -51,9 +51,9 @@ connection.close();
 Prepare the database:
 
 ```sql
-CREATE DATABASE jdbc_demo;
+CREATE DATABASE demo;
 CREATE USER 'user'@'%';
-GRANT ALL ON jdbc_demo.* TO 'user'@'%' IDENTIFIED BY 'password';
+GRANT ALL ON demo.* TO 'user'@'%' IDENTIFIED BY 'password';
 FLUSH PRIVILEGES;
 ```
 

jdbc/part1/pom.xml

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>2.7.4</version>
+			<version>3.1.2</version>
 		</dependency>
 	</dependencies>
 

jdbc/part1/src/main/java/com/example/Application.java

@@ -28,14 +28,14 @@ public static void main(String[] args) throws SQLException {
 	private static void initDatabaseConnection() throws SQLException {
 		System.out.println("Connecting to the database...");
 		connection = DriverManager.getConnection(
-				"jdbc:mariadb://localhost:3306/jdbc_demo",
+				"jdbc:mariadb://localhost:3306/demo",
 				"user", "password");
 		System.out.println("Connection valid: " + connection.isValid(5));
 		/*
 		If you are using MariaDB SkySQL (https://mariadb.com/products/skysql),
 		enable SSL and specify the path to the CA chain file that you can download
 		from the SkySQL Portal (https://cloud.mariadb.com):
-			jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/jdbc_demo?useSsl=true&serverSslCert=/path/to/your/skysql_chain.pem
+			jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/demo?useSsl=true&serverSslCert=/path/to/your/skysql_chain.pem
 		*/
 	}
 

jdbc/part2/README.md

@@ -49,12 +49,12 @@ try (PreparedStatement statement = connection.prepareStatement("""
 Prepare the database:
 
 ```sql
-CREATE DATABASE jdbc_demo;
+CREATE DATABASE demo;
 CREATE USER 'user'@'%';
-GRANT ALL ON jdbc_demo.* TO 'user'@'%' IDENTIFIED BY 'password';
+GRANT ALL ON demo.* TO 'user'@'%' IDENTIFIED BY 'password';
 FLUSH PRIVILEGES;
 
-USE jdbc_demo;
+USE demo;
 CREATE TABLE programming_language(
     name VARCHAR(50) NOT NULL UNIQUE,
     rating INT

jdbc/part2/pom.xml

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>2.7.4</version>
+			<version>3.1.2</version>
 		</dependency>
 	</dependencies>
 

jdbc/part2/src/main/java/com/example/Application.java

@@ -99,14 +99,14 @@ private static void deleteData(String nameExpression) throws SQLException {
 	private static void initDatabaseConnection() throws SQLException {
 		System.out.println("Connecting to the database...");
 		connection = DriverManager.getConnection(
-				"jdbc:mariadb://localhost:3306/jdbc_demo",
+				"jdbc:mariadb://localhost:3306/demo",
 				"user", "password");
 		System.out.println("Connection valid: " + connection.isValid(5));
 		/*
 		 * If you are using MariaDB SkySQL (https://mariadb.com/products/skysql),
 		 * enable SSL and specify the path to the CA chain file that you can download
 		 * from the SkySQL Portal (https://cloud.mariadb.com):
-		 * jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/jdbc_demo?useSsl=true&
+		 * jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/demo?useSsl=true&
 		 * serverSslCert=/path/to/your/skysql_chain.pem
 		 */
 	}

jdbc/part3/README.md

@@ -63,12 +63,12 @@ dataSource.close();
 Prepare the database:
 
 ```sql
-CREATE DATABASE jdbc_demo;
+CREATE DATABASE demo;
 CREATE USER 'user'@'%';
-GRANT ALL ON jdbc_demo.* TO 'user'@'%' IDENTIFIED BY 'password';
+GRANT ALL ON demo.* TO 'user'@'%' IDENTIFIED BY 'password';
 FLUSH PRIVILEGES;
 
-USE jdbc_demo;
+USE demo;
 CREATE TABLE programming_language(
     name VARCHAR(50) NOT NULL UNIQUE,
     rating INT

jdbc/part3/pom.xml

@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.mariadb.jdbc</groupId>
 			<artifactId>mariadb-java-client</artifactId>
-			<version>2.7.4</version>
+			<version>3.1.2</version>
 		</dependency>
 
 		<!-- Connection pool -->

jdbc/part3/src/main/resources/database.properties

@@ -1,10 +1,10 @@
 # HikariCP database connection pool configuration
-jdbcUrl=jdbc:mariadb://localhost:3306/jdbc_demo
+jdbcUrl=jdbc:mariadb://localhost:3306/demo
 dataSource.username=user
 dataSource.password=password
 
 # If you are using MariaDB SkySQL (https://mariadb.com/products/skysql),
 # enable SSL and specify the path to the CA chain file that you can download
 # from the SkySQL Portal (https://cloud.mariadb.com):
 #
-# jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/jdbc_demo?useSsl=true&serverSslCert=/path/to/your/skysql_chain.pem
+# jdbc:mariadb://demo-db0000xxxx.mdb000xxxx.db.skysql.net:5047/demo?useSsl=true&serverSslCert=/path/to/your/skysql_chain.pem