update

Author: mevdschee

composer.json

@@ -11,7 +11,8 @@
     "require": {
         "php": ">=8.0",
         "ext-memcache": "*",
-        "ext-mysqli": "*"
+        "ext-mysqli": "*",
+        "mintyphp/pathql": "*"
     },
     "require-dev": {
         "phpunit/phpunit": "*",

src/Core/Orm.php

@@ -3,6 +3,8 @@
 namespace MintyPHP\Core;
 
 use MintyPHP\Core\DB;
+use MintyPHP\Core\Cache;
+use MintyPHP\PathQL\PathQL;
 
 /**
  * ORM (Object-Relational Mapping) layer for MintyPHP
@@ -11,12 +13,16 @@
  */
 class Orm
 {
+    private PathQL $pathQL;
+
     /**
      * Constructor for the Orm class.
      * @param DB $db Database instance for executing queries.
+     * @param Cache $cache Cache instance for storing schema metadata.
      */
-    public function __construct(private DB $db)
+    public function __construct(private DB $db, Cache $cache)
     {
+        $this->pathQL = new PathQL($db, $cache);
     }
 
     /**
@@ -106,4 +112,22 @@ public function delete(string $tableName, string|int $id, string $idField = 'id'
         $sql = "DELETE FROM `$tableName` WHERE `$idField` = ?";
         return $this->db->delete($sql, $id) ? true : false;
     }
+
+    /**
+     * Execute a query with automatic path inference for hierarchical results using PathQL.
+     * 
+     * Automatically infers the structure of the result set based on SQL JOINs and
+     * foreign key relationships, returning nested arrays/objects instead of flat rows.
+     * 
+     * @param string $sql The SQL query to execute
+     * @param array<int|string,mixed> $params Parameters for prepared statement
+     * @param array<string,string> $pathHints Optional path mappings for table aliases
+     *                     Format: ['alias' => '$.path', 'other' => '$.parent.child[]']
+     * @return array<int|string,mixed> Hierarchical result structure based on inferred paths
+     * @throws \RuntimeException If query execution fails
+     */
+    public function path(string $sql, array $params = [], array $pathHints = []): array
+    {
+        return $this->pathQL->execute($sql, $params, $pathHints);
+    }
 }

src/Error/TemplateError.php

@@ -33,7 +33,8 @@ class Orm
     public static function getInstance(): CoreOrm
     {
         return self::$instance ??= new CoreOrm(
-            DB::getInstance()
+            DB::getInstance(),
+            Cache::getInstance()
         );
     }
 
@@ -102,4 +103,23 @@ public static function delete(string $tableName, string|int $id, string $idField
         $instance = self::getInstance();
         return $instance->delete($tableName, $id, $idField);
     }
+
+    /**
+     * Execute a query with automatic path inference for hierarchical results using PathQL.
+     * 
+     * Automatically infers the structure of the result set based on SQL JOINs and
+     * foreign key relationships, returning nested arrays/objects instead of flat rows.
+     * 
+     * @param string $sql The SQL query to execute
+     * @param array<int|string,mixed> $params Parameters for prepared statement
+     * @param array<string,string> $pathHints Optional path mappings for table aliases
+     *                     Format: ['alias' => '$.path', 'other' => '$.parent.child[]']
+     * @return array<int|string,mixed> Hierarchical result structure based on inferred paths
+     * @throws \RuntimeException If query execution fails
+     */
+    public static function path(string $sql, array $params = [], array $pathHints = []): array
+    {
+        $instance = self::getInstance();
+        return $instance->path($sql, $params, $pathHints);
+    }
 }

src/Orm.php

@@ -3,6 +3,7 @@
 namespace MintyPHP\Tests\Core;
 
 use MintyPHP\Core\DB;
+use MintyPHP\Core\Cache;
 use MintyPHP\Core\Orm;
 use PHPUnit\Framework\TestCase;
 
@@ -16,15 +17,19 @@
 class OrmTest extends TestCase
 {
 	private static DB $db;
+	private static Cache $cache;
 	private static Orm $orm;
 
 	public static function setUpBeforeClass(): void
 	{
 		// Create database connection
 		self::$db = new DB(null, 'mintyphp_test', 'mintyphp_test', 'mintyphp_test', null, null);
 
+		// Create cache instance
+		self::$cache = new Cache('mintyphp_test_', 'localhost:11211');
+
 		// Create Core ORM instance
-		self::$orm = new Orm(self::$db);
+		self::$orm = new Orm(self::$db, self::$cache);
 	}
 
 	public function testDropPostsBefore(): void
@@ -202,6 +207,73 @@ public function testSelectPostNotFound(): void
 	 * @depends testInsertPosts
 	 * @depends testUpdatePosts
 	 */
+	public function testPathQueryWithoutHints(): void
+	{
+		// Test automatic path inference - posts with their users
+		$result = self::$orm->path(
+			'SELECT p.id, p.slug, u.id, u.username 
+			 FROM posts p 
+			 JOIN users u ON p.user_id = u.id 
+			 WHERE p.id <= ? 
+			 ORDER BY p.id',
+			[2]
+		);
+
+		// Should return nested structure with users as objects within posts array
+		$this->assertCount(2, $result);
+		assert(is_array($result[0]), 'result[0] is not an array');
+		$this->assertEquals(1, $result[0]['id']);
+		$this->assertEquals('2014-08-test1', $result[0]['slug']);
+		$this->assertArrayHasKey('u', $result[0]);
+		$this->assertIsArray($result[0]['u']);
+		$this->assertEquals(1, $result[0]['u']['id']);
+		$this->assertEquals('test1', $result[0]['u']['username']);
+	}
+
+	/**
+	 * @depends testDropPostsBefore
+	 * @depends testDropUsersBefore
+	 * @depends testCreateUsers
+	 * @depends testCreatePosts
+	 * @depends testInsertUsers
+	 * @depends testInsertPosts
+	 * @depends testUpdatePosts
+	 */
+	public function testPathQueryWithHints(): void
+	{
+		// Test with custom path hints for cleaner structure
+		$result = self::$orm->path(
+			'SELECT p.id, p.slug, p.title, u.id, u.username 
+			 FROM posts p 
+			 JOIN users u ON p.user_id = u.id 
+			 WHERE p.id = ?',
+			[1],
+			[
+				'p' => '$',
+				'u' => '$.author'
+			]
+		);
+
+		// Should return single object with custom 'author' field
+		$this->assertEquals(1, $result['id']);
+		$this->assertEquals('2014-08-test1', $result['slug']);
+		$this->assertEquals('test', $result['title']);
+		$this->assertArrayHasKey('author', $result);
+		$this->assertIsArray($result['author']);
+		$this->assertEquals(1, $result['author']['id']);
+		$this->assertEquals('test1', $result['author']['username']);
+	}
+
+	/**
+	 * @depends testDropPostsBefore
+	 * @depends testDropUsersBefore
+	 * @depends testCreateUsers
+	 * @depends testCreatePosts
+	 * @depends testInsertUsers
+	 * @depends testInsertPosts
+	 * @depends testUpdatePosts
+	 * @depends testDeletePosts
+	 */
 	public function testDeletePosts(): void
 	{
 		$result = self::$orm->delete('posts', 1);