Migrate to composite/db 0.4.0

Author: compositephp

composer.json

@@ -13,7 +13,7 @@
     ],
     "require": {
         "php": "^8.1",
-        "compositephp/db": "^0.3.1",
+        "compositephp/db": "^0.4.0",
         "iamcal/sql-parser": "^0.4.0",
         "nette/php-generator": "^4.0",
         "symfony/console": "2 - 6",

src/Generator/CachedTableClassBuilder.php

@@ -64,9 +64,9 @@ protected function generateFindOne(): ?Method
             $this->tableConfig->primaryKeys
         );
         if (count($this->tableConfig->primaryKeys) === 1) {
-            $body = 'return $this->createEntity($this->findByPkCachedInternal(' . $this->buildVarsList($this->tableConfig->primaryKeys) . '));';
+            $body = 'return $this->_findByPkCached(' . $this->buildVarsList($this->tableConfig->primaryKeys) . ');';
         } else {
-            $body = 'return $this->createEntity($this->findOneCachedInternal(' . $this->buildVarsList($this->tableConfig->primaryKeys) . '));';
+            $body = 'return $this->_findOneCached(' . $this->buildVarsList($this->tableConfig->primaryKeys) . ');';
         }
 
         $method = (new Method('findByPk'))
@@ -84,14 +84,14 @@ protected function generateFindAll(): Method
             ->setPublic()
             ->setComment('@return ' . $this->entityClassShortName . '[]')
             ->setReturnType('array')
-            ->setBody('return $this->createEntities($this->findAllCachedInternal());');
+            ->setBody('return $this->_findAllCached();');
     }
 
     protected function generateCountAll(): Method
     {
         return (new Method('countAll'))
             ->setPublic()
             ->setReturnType('int')
-            ->setBody('return $this->countAllCachedInternal();');
+            ->setBody('return $this->_countAllCached();');
     }
 }

src/Generator/TableClassBuilder.php

@@ -45,9 +45,9 @@ protected function generateFindOne(): ?Method
             $this->tableConfig->primaryKeys
         );
         if (count($this->tableConfig->primaryKeys) === 1) {
-            $body = 'return $this->createEntity($this->findByPkInternal(' . $this->buildVarsList($this->tableConfig->primaryKeys) . '));';
+            $body = 'return $this->_findByPk(' . $this->buildVarsList($this->tableConfig->primaryKeys) . ');';
         } else {
-            $body = 'return $this->createEntity($this->findOneInternal(' . $this->buildVarsList($this->tableConfig->primaryKeys) . '));';
+            $body = 'return $this->_findOne(' . $this->buildVarsList($this->tableConfig->primaryKeys) . ');';
         }
         $method = (new Method('findByPk'))
             ->setPublic()
@@ -64,14 +64,14 @@ protected function generateFindAll(): Method
             ->setPublic()
             ->setComment('@return ' . $this->entityClassShortName . '[]')
             ->setReturnType('array')
-            ->setBody('return $this->createEntities($this->findAllInternal());');
+            ->setBody('return $this->_findAll();');
     }
 
     protected function generateCountAll(): Method
     {
         return (new Method('countAll'))
             ->setPublic()
             ->setReturnType('int')
-            ->setBody('return $this->countAllInternal();');
+            ->setBody('return $this->_countAll();');
     }
 }

src/Migration/MigrationVersionTable.php

@@ -28,15 +28,15 @@ protected function getConfig(): TableConfig
 
     public function checkMigrationExecuted(string $version): bool
     {
-        return (bool)$this->findOneInternal(['version' => $version]);
+        return (bool)$this->_findOne(['version' => $version]);
     }
 
     /**
      * @return MigrationVersion[]
      */
     public function findAll(): array
     {
-        return $this->createEntities($this->findAllInternal(orderBy: ['executed_at' => 'DESC']));
+        return $this->_findAll(orderBy: ['executed_at' => 'DESC']);
     }
 
     public function insertVersion(AbstractMigration $migration): void
@@ -70,7 +70,7 @@ public function insertVersion(AbstractMigration $migration): void
 
     public function deleteVersion(AbstractMigration $migration): void
     {
-        $entity = $this->createEntity($this->findOneInternal(['version' => $migration->getName()]));
+        $entity = $this->_findOne(['version' => $migration->getName()]);
         $nativeConnection = $this->getConnection()->getNativeConnection();
         if ($nativeConnection instanceof \PDO) {
             try {

tests/Generator/CachedTableClassBuilderTest.php

@@ -56,7 +56,7 @@ protected function getFlushCacheKeys(TestAutoincrementEntity|AbstractEntity $ent
 
 	public function findByPk(int $id): ?TestAutoincrementEntity
 	{
-		return $this->createEntity($this->findByPkCachedInternal($id));
+		return $this->_findByPkCached($id);
 	}
 
 
@@ -65,13 +65,13 @@ public function findByPk(int $id): ?TestAutoincrementEntity
 	 */
 	public function findAll(): array
 	{
-		return $this->createEntities($this->findAllCachedInternal());
+		return $this->_findAllCached();
 	}
 
 
 	public function countAll(): int
 	{
-		return $this->countAllCachedInternal();
+		return $this->_countAllCached();
 	}
 }
 '
@@ -105,7 +105,7 @@ protected function getFlushCacheKeys(TestCompositeEntity|AbstractEntity $entity)
 
 	public function findByPk(int $user_id, int $post_id): ?TestCompositeEntity
 	{
-		return $this->createEntity($this->findOneCachedInternal([\'user_id\' => $user_id, \'post_id\' => $post_id]));
+		return $this->_findOneCached([\'user_id\' => $user_id, \'post_id\' => $post_id]);
 	}
 
 
@@ -114,13 +114,13 @@ public function findByPk(int $user_id, int $post_id): ?TestCompositeEntity
 	 */
 	public function findAll(): array
 	{
-		return $this->createEntities($this->findAllCachedInternal());
+		return $this->_findAllCached();
 	}
 
 
 	public function countAll(): int
 	{
-		return $this->countAllCachedInternal();
+		return $this->_countAllCached();
 	}
 }
 '

tests/Generator/TableClassBuilderTest.php

@@ -48,7 +48,7 @@ protected function getConfig(): TableConfig
 
 	public function findByPk(int $id): ?TestAutoincrementEntity
 	{
-		return $this->createEntity($this->findByPkInternal($id));
+		return $this->_findByPk($id);
 	}
 
 
@@ -57,13 +57,13 @@ public function findByPk(int $id): ?TestAutoincrementEntity
 	 */
 	public function findAll(): array
 	{
-		return $this->createEntities($this->findAllInternal());
+		return $this->_findAll();
 	}
 
 
 	public function countAll(): int
 	{
-		return $this->countAllInternal();
+		return $this->_countAll();
 	}
 }
 '
@@ -89,7 +89,7 @@ protected function getConfig(): TableConfig
 
 	public function findByPk(int $user_id, int $post_id): ?TestCompositeEntity
 	{
-		return $this->createEntity($this->findOneInternal([\'user_id\' => $user_id, \'post_id\' => $post_id]));
+		return $this->_findOne([\'user_id\' => $user_id, \'post_id\' => $post_id]);
 	}
 
 
@@ -98,13 +98,13 @@ public function findByPk(int $user_id, int $post_id): ?TestCompositeEntity
 	 */
 	public function findAll(): array
 	{
-		return $this->createEntities($this->findAllInternal());
+		return $this->_findAll();
 	}
 
 
 	public function countAll(): int
 	{
-		return $this->countAllInternal();
+		return $this->_countAll();
 	}
 }
 '

tests/Providers/MySQL/MySQLComparatorTest.php

@@ -331,7 +331,7 @@ public function __construct(
             [
                 'entity' => new Entities\TestOptimisticLockEntity( 'a'),
                 'sql' => null,
-                'expectedNewColumns' => ['id', 'name', 'created_at', 'version'],
+                'expectedNewColumns' => ['id', 'name', 'created_at', 'lock_version'],
                 'expectedChangedColumns' => [],
                 'expectedNewIndexes' => [],
                 'expectedDeletedIndexes' => [],
@@ -342,7 +342,7 @@ public function __construct(
                             `id` INT NOT NULL AUTO_INCREMENT,
                             `name` VARCHAR(255) NOT NULL,
                             `created_at` TIMESTAMP(6) NOT NULL DEFAULT CURRENT_TIMESTAMP(6),
-                            `version` INT NOT NULL DEFAULT 1,
+                            `lock_version` INT NOT NULL DEFAULT 1,
                             PRIMARY KEY (`id`)
                         ) ENGINE=InnoDB COLLATE=utf8mb4_unicode_ci;
                     SQL,

tests/TestStand/Tables/TestMySQLTable.php

@@ -15,6 +15,6 @@ protected function getConfig(): TableConfig
 
     public function findByPk(int $id): ?TestMigrationEntityV1
     {
-        return $this->createEntity($this->findByPkInternal($id));
+        return $this->_findByPk($id);
     }
 }