Merge pull request #10 from mychidarko/next

Add DB Url support
leafsphp · Aug 3, 2023 · 6d7cad8 · 6d7cad8
2 parents 5b66375 + f3d74b6
commit 6d7cad8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -8,7 +8,7 @@
     "php",
     "framework"
   ],
-  "homepage": "https://leafphp.netlify.app/#/",
+  "homepage": "https://leafphp.dev/modules/db/",
   "type": "library",
   "license": "MIT",
   "authors": [

diff --git a/src/Db/Core.php b/src/Db/Core.php
@@ -140,7 +140,7 @@ public function connect(
             $dbtype = $this->config('dbtype');
 
             $connection = new \PDO(
-                $this->dsn(),
+                $this->config('dbUrl') ?? $this->dsn(),
                 $dbtype === 'sqlite' ? null : $this->config('username'),
                 $dbtype === 'sqlite' ? null : $this->config('password'),
                 array_merge(

diff --git a/tests/mysql/connect.test.php b/tests/mysql/connect.test.php
@@ -1,7 +1,7 @@
 <?php
 
 beforeAll(function () {
-    $pdo = new \PDO('mysql:host=sql7.freemysqlhosting.net;dbname=sql7600346', 'sql7600346', 'l87WSttrMv');
+    $pdo = new \PDO('mysql:host=eu-cdbr-west-03.cleardb.net;dbname=heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17');
 
     $query = '
 		DROP TABLE IF EXISTS `test`;
@@ -24,7 +24,7 @@
 
     try {
         $db = new \Leaf\Db();
-        expect($db->connect('sql7.freemysqlhosting.net', 'sql7600346', 'sql7600346', 'l87WSttrMv'))
+        expect($db->connect('eu-cdbr-west-03.cleardb.net', 'heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17'))
             ->toBeInstanceOf(\PDO::class);
         $db->close();
 
@@ -38,7 +38,7 @@
 it('inserts dummy user into `test` table', function () {
     $success = false;
     $db = new \Leaf\Db();
-    $db->connect('sql7.freemysqlhosting.net', 'sql7600346', 'sql7600346', 'l87WSttrMv');
+    $db->connect('eu-cdbr-west-03.cleardb.net', 'heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17');
 
     try {
         $db->insert('test')
@@ -67,7 +67,7 @@
 
 it('selects dummy user from `test` table', function () {
     $db = new \Leaf\Db();
-    $db->connect('sql7.freemysqlhosting.net', 'sql7600346', 'sql7600346', 'l87WSttrMv');
+    $db->connect('eu-cdbr-west-03.cleardb.net', 'heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17');
 
     $user = $db->select('test')
         ->where('name', 'Name')

diff --git a/tests/mysql/leaf-builder.test.php b/tests/mysql/leaf-builder.test.php
@@ -2,7 +2,7 @@
 
 it('orders results in ascending order', function () {
     $db = new \Leaf\Db();
-    $db->connect('sql7.freemysqlhosting.net', 'sql7600346', 'sql7600346', 'l87WSttrMv');
+    $db->connect('eu-cdbr-west-03.cleardb.net', 'heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17');
 
     $users = $db->select('test')->orderBy("created_at", "asc")->all();
 
@@ -12,7 +12,7 @@
 
 it('orders results in descending order', function () {
     $db = new \Leaf\Db();
-    $db->connect('sql7.freemysqlhosting.net', 'sql7600346', 'sql7600346', 'l87WSttrMv');
+    $db->connect('eu-cdbr-west-03.cleardb.net', 'heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17');
 
     $users = $db->select('test')->orderBy("created_at", "desc")->all();
 
@@ -22,7 +22,7 @@
 
 it('orders by dummy name and count', function () {
     $db = new \Leaf\Db();
-    $db->connect('sql7.freemysqlhosting.net', 'sql7600346', 'sql7600346', 'l87WSttrMv');
+    $db->connect('eu-cdbr-west-03.cleardb.net', 'heroku_fb1311a639bb407', 'b9607a8a6d5ebb', 'cc589b17');
 
     $data = $db->select('test', 'name, COUNT(*)')->groupBy("created_at")->all();