Fix auto-detection of MariaDB in Laravel Sail

Closes #136

Author: damms005

bun.lock

@@ -0,0 +1,26 @@
+const eslint = require('@typescript-eslint/eslint-plugin')
+const parser = require('@typescript-eslint/parser')
+
+module.exports = [
+	{
+		ignores: ['out/**', 'dist/**', '**/*.d.ts']
+	},
+	{
+		files: ['src/**/*.ts'],
+		languageOptions: {
+			parser: parser,
+			ecmaVersion: 6,
+			sourceType: 'module'
+		},
+		plugins: {
+			'@typescript-eslint': eslint
+		},
+		rules: {
+			'@typescript-eslint/naming-convention': 'off',
+			'@typescript-eslint/semi': 'off',
+			'curly': 'off',
+			'no-throw-literal': 'warn',
+			'semi': 'off'
+		}
+	}
+]

eslint.config.js

@@ -334,4 +334,4 @@
 		"singleQuote": true,
 		"arrowParens": "avoid"
 	}
-}
+}

package-lock.json

@@ -9,7 +9,7 @@ export const LaravelMysqlProvider: DatabaseEngineProvider = {
 	name: 'Laravel Mysql (with Sail support)',
 	type: 'mysql',
 	id: 'laravel-mysql',
-	description: 'Laravel MySQL with default .env config or Sail config in docker-compose.yml',
+	description: 'Laravel MySQL/MariaDB with default .env config or Sail config in docker-compose.yml',
 	engine: undefined,
 
 	async canBeUsedInCurrentWorkspace(): Promise<boolean> {
@@ -27,7 +27,7 @@ export const LaravelMysqlProvider: DatabaseEngineProvider = {
 			return false;
 		}
 
-		log('Laravel MySQL', 'Checking if Laravel MySQL provider can be used in the current workspace...');
+		log('Laravel MySQL', 'Checking if Laravel MySQL/MariaDB provider can be used in the current workspace...');
 		const connection = await getConnectionInEnvFile('mysql', 'mysql2');
 		log('Laravel MySQL', `Connection status: ${connection ? 'successful' : 'failed'}`);
 		if (!connection) return false

package.json

@@ -21,7 +21,12 @@ export async function getConnectionInEnvFile(connection: LaravelConnection, dial
 		return
 	}
 
-	if (connection !== envConnection) {
+	if (connection === 'mysql') {
+		if (envConnection !== 'mysql' && envConnection !== 'mariadb') {
+			log('Laravel env file parser', `Connection type mismatch: expected "mysql" or "mariadb", found "${envConnection}"`);
+			return;
+		}
+	} else if (connection !== envConnection) {
 		log('Laravel env file parser', `Connection type mismatch: expected "${connection}", found "${envConnection}"`);
 		return;
 	}

src/providers/mysql/laravel-mysql-provider.ts

@@ -35,7 +35,8 @@ export function showWelcomeMessage(context: vscode.ExtensionContext) {
 
 	showMessageAndButtons(`
 					DevDb updated to ${currentVersion}.
-					✨ Now $3 one-time payment for lifetime DevDb Pro. Enjoy!
+					✨ Fixed auto-detection of MariaDB in Laravel Sail.
+					✨ Limited offer: *$9* one-time payment for *lifetime* DevDb Pro. Enjoy!
 			`, context);
 }