Merge branch 'codeigniter4:develop' into patch-10

Author: obozdag

system/Database/SQLSRV/Builder.php

@@ -297,6 +297,23 @@ private function getFullName(string $table): string
         }
 
         if ($this->db->escapeChar === '"') {
+            if (str_contains($table, '.') && ! str_starts_with($table, '.') && ! str_ends_with($table, '.')) {
+                $dbInfo   = explode('.', $table);
+                $database = $this->db->getDatabase();
+                $table    = $dbInfo[0];
+
+                if (count($dbInfo) === 3) {
+                    $database  = str_replace('"', '', $dbInfo[0]);
+                    $schema    = str_replace('"', '', $dbInfo[1]);
+                    $tableName = str_replace('"', '', $dbInfo[2]);
+                } else {
+                    $schema    = str_replace('"', '', $dbInfo[0]);
+                    $tableName = str_replace('"', '', $dbInfo[1]);
+                }
+
+                return '"' . $database . '"."' . $schema . '"."' . str_replace('"', '', $tableName) . '"' . $alias;
+            }
+
             return '"' . $this->db->getDatabase() . '"."' . $this->db->schema . '"."' . str_replace('"', '', $table) . '"' . $alias;
         }
 

system/Test/Mock/MockCache.php

@@ -92,11 +92,10 @@ public function remember(string $key, int $ttl, Closure $callback)
      * @param string $key   Cache item name
      * @param mixed  $value the data to save
      * @param int    $ttl   Time To Live, in seconds (default 60)
-     * @param bool   $raw   Whether to store the raw value.
      *
      * @return bool
      */
-    public function save(string $key, $value, int $ttl = 60, bool $raw = false)
+    public function save(string $key, $value, int $ttl = 60)
     {
         if ($this->bypass) {
             return false;

tests/system/Database/Builder/FromTest.php

@@ -153,4 +153,32 @@ public function testFromSubqueryWithSQLSRV(): void
 
         $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
     }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/8697
+     */
+    public function testConstructorWithMultipleSegmentTableWithSQLSRV(): void
+    {
+        $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+
+        $builder = new SQLSRVBuilder('database.dbo.table', $this->db);
+
+        $expectedSQL = 'SELECT * FROM "database"."dbo"."table"';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
+
+    /**
+     * @see https://github.com/codeigniter4/CodeIgniter4/issues/8697
+     */
+    public function testConstructorWithMultipleSegmentTableWithoutDatabaseWithSQLSRV(): void
+    {
+        $this->db = new MockConnection(['DBDriver' => 'SQLSRV', 'database' => 'test', 'schema' => 'dbo']);
+
+        $builder = new SQLSRVBuilder('dbo.table', $this->db);
+
+        $expectedSQL = 'SELECT * FROM "test"."dbo"."table"';
+
+        $this->assertSame($expectedSQL, str_replace("\n", ' ', $builder->getCompiledSelect()));
+    }
 }

user_guide_src/source/dbmgmt/forge.rst

@@ -41,7 +41,7 @@ Returns true/false based on success or failure:
 .. literalinclude:: forge/003.php
 
 An optional second parameter set to true will add ``IF EXISTS`` statement
-or will check if a database exists before create it (depending on DBMS).
+or will check if a database exists before creating it (depending on DBMS).
 
 .. literalinclude:: forge/004.php
 

user_guide_src/source/dbmgmt/index.rst

@@ -7,7 +7,7 @@ CodeIgniter comes with tools to restructure or seed your database.
 .. toctree::
     :titlesonly:
 
-    Database Manipulation with Database Forge <forge>
+    Database Forge <forge>
     Database Migrations <migration>
     Database Seeding <seeds>
     db_commands

user_guide_src/source/dbmgmt/migration.rst

@@ -121,7 +121,7 @@ Migrates a database group with all available migrations:
 
     php spark migrate
 
-You can use (migrate) with the following options:
+You can use ``migrate`` with the following options:
 
 - ``-g`` - to specify database group. If specified, only migrations for the specified database group will be run. If not specified, all migrations will be run.
 - ``-n`` - to choose namespace, otherwise ``App`` namespace will be used.
@@ -145,38 +145,38 @@ When using the ``--all`` option, it will scan through all namespaces attempting
 not been run. These will all be collected and then sorted as a group by date created. This should help
 to minimize any potential conflicts between the main application and any modules.
 
-rollback
-========
+migrate:rollback
+================
 
 Rolls back all migrations to a blank slate, effectively migration 0:
 
 .. code-block:: console
 
   php spark migrate:rollback
 
-You can use (rollback) with the following options:
+You can use ``migrate:rollback`` with the following options:
 
 - ``-b`` - to choose a batch: natural numbers specify the batch.
 - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment.
 
-refresh
-=======
+migrate:refresh
+===============
 
 Refreshes the database state by first rolling back all migrations, and then migrating all:
 
 .. code-block:: console
 
   php spark migrate:refresh
 
-You can use (refresh) with the following options:
+You can use ``migrate:refresh`` with the following options:
 
 - ``-g`` - to specify database group. If specified, only migrations for the specified database group will be run. If not specified, all migrations will be run.
 - ``-n`` - to choose namespace, otherwise ``App`` namespace will be used.
 - ``--all`` - to refresh all namespaces.
 - ``-f`` - to force a bypass confirmation question, it is only asked in a production environment.
 
-status
-======
+migrate:status
+==============
 
 Displays a list of all migrations and the date and time they ran, or '--' if they have not been run:
 
@@ -194,7 +194,7 @@ Displays a list of all migrations and the date and time they ran, or '--' if the
   | CodeIgniter\Settings | 2021-11-14-143905 | AddContextColumn      | default | 2022-04-06 01:23:08 | 1     |
   +----------------------+-------------------+-----------------------+---------+---------------------+-------+
 
-You can use (status) with the following options:
+You can use ``migrate:status`` with the following options:
 
 - ``-g`` - to specify database group. If specified, only migrations for the specified database group will be checked. If not specified, all migrations will be checked.
 
@@ -209,7 +209,7 @@ creates is the Pascal case version of the filename.
 
   php spark make:migration <class> [options]
 
-You can use (``make:migration``) with the following options:
+You can use ``make:migration`` with the following options:
 
 - ``--namespace`` - Set root namespace. Default: ``APP_NAMESPACE``.
 - ``--suffix``    - Append the component title to the class name.