ActiveRecord update

README.md

@@ -32,9 +32,7 @@ $primary_connection = $app->service_for_id('active_record.connection.primary', C
 # or
 $primary_connection = $app->service_for_class(ConnectionProvider::class)->connection_for_id('primary');
 
-$nodes = $app->service_for_class(NodeModel::class);
-# or
-$nodes = $app->service_for_class(ModelProvider::class)->model_for_class(NodeModel::class);
+$nodes = $app->service_for_class(ModelProvider::class)->model_for_record(Node::class);
 ```
 
 

composer.json

@@ -27,10 +27,9 @@
 	"prefer-dist": true,
 	"require": {
 		"php": ">=8.1",
-		"icanboogie/activerecord": "dev-remove-model-id as 6.0",
+		"icanboogie/activerecord": "^6.0",
 		"icanboogie/icanboogie": "^6.0",
-		"olvlvl/composer-attribute-collector": "^2.0",
-		"symfony/expression-language": "^6.3"
+		"olvlvl/composer-attribute-collector": "^2.0"
 	},
 	"require-dev": {
 		"phpstan/phpstan": "^1.10",

config/services.yml

@@ -22,10 +22,6 @@ services:
   ICanBoogie\ActiveRecord\ModelIterator:
     alias: ICanBoogie\ActiveRecord\ModelCollection
 
-  ICanBoogie\ActiveRecord\ModelResolver:
-    alias: ICanBoogie\ActiveRecord\ModelCollection
-    public: true # required by StaticModelResolver
-
   # Console
 
   ICanBoogie\Binding\ActiveRecord\Console\ListModelsCommand:

lib/ConfigBuilder.php

@@ -16,6 +16,7 @@
 use ICanBoogie\ActiveRecord\Config;
 use ICanBoogie\ActiveRecord\Config\ConnectionDefinition;
 use ICanBoogie\ActiveRecord\Model;
+use ICanBoogie\ActiveRecord\Query;
 use ICanBoogie\ActiveRecord\SchemaBuilder;
 use ICanBoogie\Config\Builder;
 
@@ -67,19 +68,25 @@ public function add_connection(
     }
 
     /**
+     * @param class-string<ActiveRecord> $activerecord_class
      * @param class-string<Model> $model_class
+     * @param class-string<Query> $query_class
      * @param (Closure(SchemaBuilder $schema): SchemaBuilder)|null $schema_builder
      */
     public function add_model(
-        string $model_class,
+        string $activerecord_class,
+        string $model_class = Model::class,
+        string $query_class = Query::class,
         string|null $table_name = null,
         string|null $alias = null,
         Closure $schema_builder = null,
         Closure $association_builder = null,
         string $connection = Config::DEFAULT_CONNECTION_ID,
     ): self {
         $this->inner->add_model(
+            activerecord_class: $activerecord_class,
             model_class: $model_class,
+            query_class: $query_class,
             table_name: $table_name,
             alias: $alias,
             schema_builder: $schema_builder,

lib/Console/ListModelsCommand.php

@@ -23,15 +23,16 @@ protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $rows = [];
 
-        foreach ($this->config->models as $model_id => $attributes) {
+        foreach ($this->config->models as $attributes) {
             $rows[] = [
-                $model_id,
+                $attributes->activerecord_class,
+                $attributes->model_class,
                 $attributes->connection,
             ];
         }
 
         $table = new Table($output);
-        $table->setHeaders([ 'Id', 'Connection' ]);
+        $table->setHeaders([ 'ActiveRecord', 'Model', 'Connection' ]);
         $table->setRows($rows);
         $table->setStyle($this->style);
         $table->render();

lib/ContainerExtension.php

@@ -17,7 +17,6 @@
 use ICanBoogie\ActiveRecord\ModelProvider;
 use ICanBoogie\Application;
 use ICanBoogie\Binding\SymfonyDependencyInjection\ExtensionWithFactory;
-use Symfony\Component\DependencyInjection\Alias;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Extension\Extension;
@@ -67,14 +66,15 @@ private function register_connections(ContainerBuilder $container): void
      */
     private function register_models(ContainerBuilder $container): void
     {
-        foreach ($this->config->models as $model) {
-            $class = $model->model_class;
-            $definition = (new Definition($class))
-                ->setFactory([ new Reference(ModelProvider::class), 'model_for_class' ])
-                ->setArguments([ $class ])
+        foreach ($this->config->models as $definition) {
+            $activerecord_class = $definition->activerecord_class;
+
+            $d = (new Definition($definition->model_class))
+                ->setFactory([ new Reference(ModelProvider::class), 'model_for_record' ])
+                ->setArguments([ $activerecord_class ])
                 ->setPublic(true);
 
-            $container->setDefinition($class, $definition);
+            $container->setDefinition(Record::format_service_id($activerecord_class), $d);
         }
     }
 }

lib/Hooks.php

@@ -15,8 +15,7 @@
 use ICanBoogie\ActiveRecord\ActiveRecordCache\RuntimeActiveRecordCache;
 use ICanBoogie\ActiveRecord\Model;
 use ICanBoogie\ActiveRecord\ModelProvider;
-use ICanBoogie\ActiveRecord\ModelResolver;
-use ICanBoogie\ActiveRecord\StaticModelResolver;
+use ICanBoogie\ActiveRecord\StaticModelProvider;
 use ICanBoogie\Application;
 use ICanBoogie\Validate\ValidationErrors;
 
@@ -35,19 +34,11 @@ public static function on_app_boot(Application\BootEvent $event): void
     {
         $app = $event->app;
 
-        ActiveRecord\StaticModelProvider::define(function (string $id) use ($app): Model {
-            static $models;
-
-            $models ??= $app->service_for_class(ModelProvider::class);
-
-            return $models->model_for_id($id);
-        });
-
-        StaticModelResolver::define(
-            static function () use ($app): ModelResolver {
+        StaticModelProvider::define(
+            static function () use ($app): ModelProvider {
                 static $resolver;
 
-                return $resolver ??= $app->service_for_class(ModelResolver::class);
+                return $resolver ??= $app->service_for_class(ModelProvider::class);
             }
         );
     }

lib/Record.php

@@ -6,28 +6,24 @@
 use ICanBoogie\ActiveRecord;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 
-use function sprintf;
-use function str_replace;
-
 #[Attribute(Attribute::TARGET_PARAMETER)]
 class Record extends Autowire
 {
+    public const SERVICE_PREFIX = 'active_record.model.';
+
+    public static function format_service_id(string $activerecord_class): string
+    {
+        return self::SERVICE_PREFIX . $activerecord_class;
+    }
+
     /**
      * @param class-string<ActiveRecord> $activerecord_class
      */
     public function __construct( // @phpstan-ignore-line
         public readonly string $activerecord_class,
     ) {
         parent::__construct(
-            expression: sprintf(
-                "service('%s').model_for_activerecord('%s')",
-                self::escape(ActiveRecord\ModelProvider::class),
-                self::escape($this->activerecord_class)
-            )
+            service: self::format_service_id($activerecord_class)
         );
     }
-
-    private static function escape(string $str): string {
-        return str_replace('\\', '\\\\', $str);
-    }
 }

tests/app/all/config/activerecord.php

@@ -4,11 +4,13 @@
 
 use ICanBoogie\ActiveRecord\Config;
 use ICanBoogie\ActiveRecord\SchemaBuilder;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Node;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\NodeModel;
 
 return fn(ConfigBuilder $config) => $config
     ->add_connection(Config::DEFAULT_CONNECTION_ID, 'sqlite::memory:')
     ->add_model(
+        activerecord_class: Node::class,
         model_class: NodeModel::class,
         schema_builder: fn(SchemaBuilder $schema) => $schema
             ->add_serial('id', primary: true)

tests/app/all/config/services.yml

@@ -11,8 +11,8 @@ services:
   test.active_record.models:
     alias: ICanBoogie\ActiveRecord\ModelProvider
 
-  test.active_record.model.node_by_class:
-    alias: Test\ICanBoogie\Binding\ActiveRecord\Acme\NodeModel
+  test.active_record.model.node:
+    alias: active_record.model.Test\ICanBoogie\Binding\ActiveRecord\Acme\Node
 
   Test\ICanBoogie\Binding\ActiveRecord\Acme\SampleService:
     autowire: true

tests/app/default/config/activerecord.php

@@ -3,12 +3,12 @@
 namespace ICanBoogie\Binding\ActiveRecord;
 
 use ICanBoogie\ActiveRecord\SchemaBuilder;
-use Test\ICanBoogie\Binding\ActiveRecord\Acme\ArticleModel;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Article;
 
 return fn(ConfigBuilder $config) => $config
     ->add_connection('cache', 'sqlite::memory:')
     ->add_model(
-        model_class: ArticleModel::class,
+        activerecord_class: Article::class,
         schema_builder: fn(SchemaBuilder $schema) => $schema
             ->add_text('body')
             ->add_datetime('date'),

tests/lib/Acme/NodeModel.php

@@ -16,7 +16,6 @@
 /**
  * @extends Model<int, Node>
  */
-#[Model\Record(Node::class)]
 class NodeModel extends Model
 {
 }

tests/lib/ActiveRecordTest.php

@@ -14,7 +14,6 @@
 use ICanBoogie\Validate\ValidationErrors;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\Article;
-use Test\ICanBoogie\Binding\ActiveRecord\Acme\ArticleModel;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\SampleRecord;
 
 /**
@@ -33,6 +32,6 @@ public function test_model(): void
     {
         $record = Article::from();
 
-        $this->assertInstanceOf(ArticleModel::class, $record->model);
+        $this->assertEquals(Article::class, $record->model->activerecord_class);
     }
 }

tests/lib/ConfigBuilderTest.php

@@ -15,7 +15,8 @@
 use ICanBoogie\ActiveRecord\ConfigBuilder;
 use ICanBoogie\ActiveRecord\SchemaBuilder;
 use PHPUnit\Framework\TestCase;
-use Test\ICanBoogie\Binding\ActiveRecord\Acme\ArticleModel;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Article;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Node;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\NodeModel;
 
 use function ICanBoogie\app;
@@ -57,13 +58,14 @@ public function test_integration(): void
             ->add_connection(Config::DEFAULT_CONNECTION_ID, 'sqlite::memory:')
             ->add_connection('cache', 'sqlite::memory:')
             ->add_model(
+                activerecord_class: Node::class,
                 model_class: NodeModel::class,
                 schema_builder: fn(SchemaBuilder $b) => $b
                     ->add_serial('id', primary: true)
                     ->add_character('title'),
             )
             ->add_model(
-                model_class: ArticleModel::class,
+                activerecord_class: Article::class,
                 schema_builder: fn(SchemaBuilder $b) => $b
                     ->add_text('body')
                     ->add_datetime('date'),

tests/lib/Console/ListModelsCommandTest.php

@@ -4,6 +4,7 @@
 
 use ICanBoogie\Binding\ActiveRecord\Console\ListModelsCommand;
 use ICanBoogie\Console\Test\CommandTestCase;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Node;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\NodeModel;
 
 final class ListModelsCommandTest extends CommandTestCase
@@ -17,6 +18,7 @@ public static function provideExecute(): array
                 ListModelsCommand::class,
                 [],
                 [
+                    Node::class,
                     NodeModel::class,
                     'primary'
                 ]

tests/lib/ContainerTest.php

@@ -11,11 +11,10 @@
 
 namespace Test\ICanBoogie\Binding\ActiveRecord;
 
+use ICanBoogie\ActiveRecord\Config;
 use ICanBoogie\ActiveRecord\Connection;
 use ICanBoogie\ActiveRecord\ConnectionProvider;
-use ICanBoogie\ActiveRecord\Model;
 use ICanBoogie\ActiveRecord\ModelProvider;
-use ICanBoogie\ActiveRecord\Config;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\NodeModel;
 
@@ -43,7 +42,7 @@ public static function provide_service(): array
             [ 'test.active_record.config', Config::class ],
             [ 'test.active_record.connections', ConnectionProvider::class ],
             [ 'test.active_record.models', ModelProvider::class ],
-            [ 'test.active_record.model.node_by_class', NodeModel::class ],
+            [ 'test.active_record.model.node', NodeModel::class ],
             [ 'active_record.connection.primary', Connection::class ],
             [ 'active_record.connection.cache', Connection::class ],
 

tests/lib/HooksTest.php

@@ -15,6 +15,7 @@
 use ICanBoogie\ActiveRecord\Config;
 use ICanBoogie\ActiveRecord\ConnectionProvider;
 use ICanBoogie\ActiveRecord\ModelCollection;
+use ICanBoogie\ActiveRecord\Query;
 use ICanBoogie\ActiveRecord\SchemaBuilder;
 use ICanBoogie\ActiveRecord\TableDefinition;
 use ICanBoogie\Binding\ActiveRecord\Hooks;
@@ -51,6 +52,7 @@ public function test_should_return_activerecord_cache(): void
                 ),
                 model_class: NodeModel::class,
                 activerecord_class: Node::class,
+                query_class: Query::class,
                 connection: Config::DEFAULT_CONNECTION_ID,
             )
         );

tests/lib/IntegrationTest.php

@@ -5,6 +5,7 @@
 use ICanBoogie\ActiveRecord\ModelProvider;
 use PHPUnit\Framework\TestCase;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\Article;
+use Test\ICanBoogie\Binding\ActiveRecord\Acme\Node;
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\NodeModel;
 
 use Test\ICanBoogie\Binding\ActiveRecord\Acme\SampleService;
@@ -16,7 +17,7 @@ final class IntegrationTest extends TestCase
     public function test_nodes_model(): void
     {
         $model_provider = app()->service_for_id('test.active_record.models', ModelProvider::class);
-        $nodes = $model_provider->model_for_class(NodeModel::class);
+        $nodes = $model_provider->model_for_record(Node::class);
 
         $this->assertInstanceOf(NodeModel::class, $nodes);
         $this->assertEquals('id', $nodes->schema->primary);