[update] setting up the database type for different pattern use cases

Also fixed #1058

Author: catfan

src/Medoo.php

@@ -182,6 +182,20 @@ class Medoo
      */
     public $errorInfo = null;
 
+    /**
+     * The keyword to connect the table alias.
+     *
+     * @var string
+     */
+    protected $tableAliasConnector = ' AS ';
+
+    /**
+     * The quote pattern string.
+     *
+     * @var string
+     */
+    protected $quotePattern = '"$1"';
+
     /**
      * Regular expression pattern for valid table names.
      *
@@ -254,11 +268,7 @@ public function __construct(array $options)
             }
         }
 
-        $this->type = strtolower($options['type']);
-
-        if ($this->type === 'mariadb') {
-            $this->type = 'mysql';
-        }
+        $this->setupType($options['type']);
 
         if (isset($options['logging']) && is_bool($options['logging'])) {
             $this->logging = $options['logging'];
@@ -506,6 +516,30 @@ public function __construct(array $options)
         }
     }
 
+    /**
+     * Setup the database type.
+     *
+     * @return void
+     */
+    public function setupType(string $type)
+    {
+        $databaseType = strtolower($type);
+
+        if ($databaseType === 'mariadb') {
+            $databaseType = 'mysql';
+        }
+
+        if ($databaseType === 'oracle') {
+            $this->tableAliasConnector = ' ';
+        } elseif ($databaseType === 'mysql') {
+            $this->quotePattern = '`$1`';
+        } elseif ($databaseType === 'mssql') {
+            $this->quotePattern = '[$1]';
+        }
+
+        $this->type = $databaseType;
+    }
+
     /**
      * Generate a new map key for the placeholder.
      *
@@ -618,14 +652,9 @@ public function exec(string $statement, array $map = [], ?callable $callback = n
      */
     protected function generate(string $statement, array $map): string
     {
-        $identifier = [
-            'mysql' => '`$1`',
-            'mssql' => '[$1]'
-        ];
-
         $statement = preg_replace(
-            '/(?!\'[^\s]+\s?)"([\p{L}_][\p{L}\p{N}@$#\-_]*)"(?!\s?[^\s]+\')/u',
-            $identifier[$this->type] ?? '"$1"',
+            '/(?!\'[^\s]+\s?)"(' . $this::COLUMN_PATTERN . ')"(?!\s?[^\s]+\')/u',
+            $this->quotePattern,
             $statement
         );
 
@@ -1214,7 +1243,7 @@ protected function selectContext(
         if (isset($tableMatch['table'], $tableMatch['alias'])) {
             $table = $this->tableQuote($tableMatch['table']);
             $tableAlias = $this->tableQuote($tableMatch['alias']);
-            $tableQuery = "{$table} AS {$tableAlias}";
+            $tableQuery = "{$table}{$this->tableAliasConnector}{$tableAlias}";
         } else {
             $table = $this->tableQuote($table);
             $tableQuery = $table;
@@ -1352,7 +1381,7 @@ protected function buildJoin(string $table, array $join, array &$map): string
             $tableName = $this->tableQuote($match['table']);
 
             if (isset($match['alias'])) {
-                $tableName .= ' AS ' . $this->tableQuote($match['alias']);
+                $tableName .= $this->tableAliasConnector . $this->tableQuote($match['alias']);
             }
 
             $tableJoin[] = $type[$match['join']] . " JOIN {$tableName} {$relation}";

tests/MedooTestCase.php

@@ -9,6 +9,9 @@ class MedooTestCase extends TestCase
 {
     protected $database;
 
+    public $tableAliasConnector = ' AS ';
+    public $quotePattern = '"$1"';
+
     public function setUp(): void
     {
         $this->database = new Medoo([
@@ -29,21 +32,30 @@ public function typesProvider(): array
 
     public function setType($type): void
     {
-        $this->database->type = $type;
+        $this->database->setupType($type);
+
+        if ($type === 'oracle') {
+            $this->tableAliasConnector = ' ';
+        } elseif ($type === 'mysql') {
+            $this->quotePattern = '`$1`';
+        } elseif ($type === 'mssql') {
+            $this->quotePattern = '[$1]';
+        }
     }
 
     public function expectedQuery($expected): string
     {
-        $identifier = [
-            'mysql' => '`$1`',
-            'mssql' => '[$1]'
-        ];
-
-        return preg_replace(
+        $result = preg_replace(
             '/(?!\'[^\s]+\s?)"([\p{L}_][\p{L}\p{N}@$#\-_]*)"(?!\s?[^\s]+\')/u',
-            $identifier[$this->database->type] ?? '"$1"',
+            $this->quotePattern,
             str_replace("\n", " ", $expected)
         );
+
+        return str_replace(
+            ' @AS ',
+            $this->tableAliasConnector,
+            $result
+        );
     }
 
     public function assertQuery($expected, $query): void

tests/SelectTest.php

@@ -46,7 +46,7 @@ public function testSelectTableWithAlias($type)
         $this->assertQuery(
             <<<EOD
             SELECT "name"
-            FROM "account" AS "user"
+            FROM "account" @AS "user"
             EOD,
             $this->database->queryString
         );
@@ -385,7 +385,7 @@ public function testSelectWithAliasJoin($type)
             <<<EOD
             SELECT "account"."name","main_post"."title"
             FROM "account"
-            LEFT JOIN "post" AS "main_post"
+            LEFT JOIN "post" @AS "main_post"
             ON "account"."user_id" = "main_post"."author_id"
             EOD,
             $this->database->queryString