fix support size properties for non-integer primary keys

Insolita · Insolita · commit a88c937e9d42 · 2021-07-01T18:55:46.000+08:00
diff --git a/src/lib/AttributeResolver.php b/src/lib/AttributeResolver.php
@@ -204,6 +204,9 @@ protected function resolveProperty($propertyName, SpecObjectInterface $property,
                     $phpType = SchemaTypeResolver::schemaToPhpType($foreignPkProperty);
                     $attribute->setPhpType($phpType)
                               ->setDbType($this->guessDbType($foreignPkProperty, true, true));
+                    $attribute->setSize($foreignPkProperty->maxLength ?? null);
+                    [$min, $max] = $this->guessMinMax($foreignPkProperty);
+                    $attribute->setLimits($min, $max, $foreignPkProperty->minLength ?? null);
 
                     $relation = (new AttributeRelation($propertyName, $relatedTableName, $relatedClassName))
                         ->asHasOne([$foreignPk => $attribute->columnName])->asSelfReference();
@@ -227,7 +230,9 @@ protected function resolveProperty($propertyName, SpecObjectInterface $property,
                     $phpType = SchemaTypeResolver::schemaToPhpType($foreignPkProperty);
                     $attribute->setPhpType($phpType)
                               ->setDbType($this->guessDbType($foreignPkProperty, true, true));
-
+                    $attribute->setSize($foreignPkProperty->maxLength ?? null);
+                    [$min, $max] = $this->guessMinMax($foreignPkProperty);
+                    $attribute->setLimits($min, $max, $foreignPkProperty->minLength ?? null);
                     $relation = (new AttributeRelation($propertyName, $relatedTableName, $relatedClassName))
                         ->asHasOne([$foreignPk => $attribute->columnName]);
                     $this->relations[$propertyName] = $relation;
diff --git a/src/lib/FakerStubResolver.php b/src/lib/FakerStubResolver.php
@@ -81,6 +81,10 @@ private function fakeForString():?string
             && $this->attribute->size < 10) {
             return '$faker->title';
         }
+        if ($this->attribute->primary || $this->attribute->isReference()) {
+            $size = $this->attribute->size ?? 255;
+            return 'substr($uniqueFaker->sha256, 0, ' . $size . ')';
+        }
 
         $patterns = [
             '~_id$~' => '$uniqueFaker->numberBetween(0, 1000000)',
diff --git a/tests/fixtures/blog.php b/tests/fixtures/blog.php
@@ -61,7 +61,8 @@
         'description' => 'A blog post (uid used as pk for test purposes)',
         'attributes' => [
             'uid' => (new Attribute('uid', ['phpType' => 'string', 'dbType' => 'string']))
-                ->setReadOnly()->setRequired()->setIsPrimary()->setSize(255)->setFakerStub('substr($faker->text(255), 0, 255)'),
+                ->setReadOnly()->setRequired()->setIsPrimary()->setSize(128)
+                ->setFakerStub('substr($uniqueFaker->sha256, 0, 128)'),
             'title' => (new Attribute('title', ['phpType' => 'string', 'dbType' => 'string']))
                 ->setRequired()->setSize(255)->setFakerStub('substr($faker->sentence, 0, 255)'),
             'slug' => (new Attribute('slug', ['phpType' => 'string', 'dbType' => 'string']))
@@ -106,9 +107,10 @@
                 ->setFakerStub('$uniqueFaker->numberBetween(0, 2147483647)'),
             'post' => (new Attribute('post', ['phpType' => 'string', 'dbType' => 'string']))
                 ->setRequired()
+                ->setSize(128)
                 ->asReference('Post')
                 ->setDescription('A blog post (uid used as pk for test purposes)')
-                ->setFakerStub('$uniqueFaker->numberBetween(0, 1000000)'),
+                ->setFakerStub('substr($uniqueFaker->sha256, 0, 128)'),
             'author' => (new Attribute('author', ['phpType' => 'int', 'dbType' => 'integer']))
                 ->setRequired()
                 ->asReference('User')
diff --git a/tests/specs/blog.yaml b/tests/specs/blog.yaml
@@ -128,7 +128,7 @@ components:
       properties:
         uid:
           type: string
-          maxLength: 255
+          maxLength: 128
           x-db-type: varchar
           readOnly: True
         title:
diff --git a/tests/specs/blog/migrations/m200000_000002_create_table_blog_posts.php b/tests/specs/blog/migrations/m200000_000002_create_table_blog_posts.php
@@ -8,7 +8,7 @@ class m200000_000002_create_table_blog_posts extends \yii\db\Migration
     public function up()
     {
         $this->createTable('{{%blog_posts}}', [
-            'uid' => $this->string(255)->notNull(),
+            'uid' => $this->string(128)->notNull(),
             'title' => $this->string(255)->notNull(),
             'slug' => $this->string(200)->null()->defaultValue(null),
             'category_id' => $this->integer()->notNull(),
diff --git a/tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations/m200000_000004_create_table_post_comments.php
@@ -9,7 +9,7 @@ public function up()
     {
         $this->createTable('{{%post_comments}}', [
             'id' => $this->bigPrimaryKey(),
-            'post_id' => $this->string()->notNull(),
+            'post_id' => $this->string(128)->notNull(),
             'author_id' => $this->integer()->notNull(),
             'message' => 'json NOT NULL DEFAULT \'[]\'',
             'meta_data' => 'json NOT NULL DEFAULT \'[]\'',
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000002_create_table_blog_posts.php b/tests/specs/blog/migrations_maria_db/m200000_000002_create_table_blog_posts.php
@@ -8,7 +8,7 @@ class m200000_000002_create_table_blog_posts extends \yii\db\Migration
     public function up()
     {
         $this->createTable('{{%blog_posts}}', [
-            'uid' => $this->string(255)->notNull(),
+            'uid' => $this->string(128)->notNull(),
             'title' => $this->string(255)->notNull(),
             'slug' => $this->string(200)->null()->defaultValue(null),
             'category_id' => $this->integer()->notNull(),
diff --git a/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations_maria_db/m200000_000004_create_table_post_comments.php
@@ -9,7 +9,7 @@ public function up()
     {
         $this->createTable('{{%post_comments}}', [
             'id' => $this->bigPrimaryKey(),
-            'post_id' => $this->string()->notNull(),
+            'post_id' => $this->string(128)->notNull(),
             'author_id' => $this->integer()->notNull(),
             'message' => 'json NOT NULL DEFAULT \'[]\'',
             'meta_data' => 'json NOT NULL DEFAULT \'[]\'',
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000002_create_table_blog_posts.php b/tests/specs/blog/migrations_mysql_db/m200000_000002_create_table_blog_posts.php
@@ -8,7 +8,7 @@ class m200000_000002_create_table_blog_posts extends \yii\db\Migration
     public function up()
     {
         $this->createTable('{{%blog_posts}}', [
-            'uid' => $this->string(255)->notNull(),
+            'uid' => $this->string(128)->notNull(),
             'title' => $this->string(255)->notNull(),
             'slug' => $this->string(200)->null()->defaultValue(null),
             'category_id' => $this->integer()->notNull(),
diff --git a/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations_mysql_db/m200000_000004_create_table_post_comments.php
@@ -9,7 +9,7 @@ public function up()
     {
         $this->createTable('{{%post_comments}}', [
             'id' => $this->bigPrimaryKey(),
-            'post_id' => $this->string()->notNull(),
+            'post_id' => $this->string(128)->notNull(),
             'author_id' => $this->integer()->notNull(),
             'message' => 'json NOT NULL',
             'meta_data' => 'json NOT NULL',
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000002_create_table_blog_posts.php b/tests/specs/blog/migrations_pgsql_db/m200000_000002_create_table_blog_posts.php
@@ -8,7 +8,7 @@ class m200000_000002_create_table_blog_posts extends \yii\db\Migration
     public function safeUp()
     {
         $this->createTable('{{%blog_posts}}', [
-            'uid' => $this->string(255)->notNull(),
+            'uid' => $this->string(128)->notNull(),
             'title' => $this->string(255)->notNull(),
             'slug' => $this->string(200)->null()->defaultValue(null),
             'category_id' => $this->integer()->notNull(),
diff --git a/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php b/tests/specs/blog/migrations_pgsql_db/m200000_000004_create_table_post_comments.php
@@ -9,7 +9,7 @@ public function safeUp()
     {
         $this->createTable('{{%post_comments}}', [
             'id' => $this->bigPrimaryKey(),
-            'post_id' => $this->string()->notNull(),
+            'post_id' => $this->string(128)->notNull(),
             'author_id' => $this->integer()->notNull(),
             'message' => 'json NOT NULL DEFAULT \'[]\'',
             'meta_data' => 'json NOT NULL DEFAULT \'[]\'',
diff --git a/tests/specs/blog/models/PostFaker.php b/tests/specs/blog/models/PostFaker.php
@@ -29,7 +29,7 @@ public function generateModel($attributes = [])
         $faker = $this->faker;
         $uniqueFaker = $this->uniqueFaker;
         $model = new Post();
-        $model->uid = substr($faker->text(255), 0, 255);
+        $model->uid = substr($uniqueFaker->sha256, 0, 128);
         $model->title = substr($faker->sentence, 0, 255);
         $model->slug = substr($uniqueFaker->slug, 0, 200);
         $model->active = $faker->boolean;
diff --git a/tests/specs/blog/models/base/Comment.php b/tests/specs/blog/models/base/Comment.php
@@ -27,7 +27,7 @@ public function rules()
         return [
             'trim' => [['post_id'], 'trim'],
             'required' => [['post_id', 'author_id', 'created_at'], 'required'],
-            'post_id_string' => [['post_id'], 'string'],
+            'post_id_string' => [['post_id'], 'string', 'max' => 128],
             'post_id_exist' => [['post_id'], 'exist', 'targetRelation' => 'Post'],
             'author_id_integer' => [['author_id'], 'integer'],
             'author_id_exist' => [['author_id'], 'exist', 'targetRelation' => 'Author'],

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ class m200000_000002_create_table_blog_posts extends \yii\db\Migration`
`8`	`8`	`public function up()`
`9`	`9`	`{`
`10`	`10`	`$this->createTable('{{%blog_posts}}', [`
`11`		`- 'uid' => $this->string(255)->notNull(),`
	`11`	`+ 'uid' => $this->string(128)->notNull(),`
`12`	`12`	`'title' => $this->string(255)->notNull(),`
`13`	`13`	`'slug' => $this->string(200)->null()->defaultValue(null),`
`14`	`14`	`'category_id' => $this->integer()->notNull(),`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ public function up()`
`9`	`9`	`{`
`10`	`10`	`$this->createTable('{{%post_comments}}', [`
`11`	`11`	`'id' => $this->bigPrimaryKey(),`
`12`		`- 'post_id' => $this->string()->notNull(),`
	`12`	`+ 'post_id' => $this->string(128)->notNull(),`
`13`	`13`	`'author_id' => $this->integer()->notNull(),`
`14`	`14`	`'message' => 'json NOT NULL DEFAULT \'[]\'',`
`15`	`15`	`'meta_data' => 'json NOT NULL DEFAULT \'[]\'',`