finish base cli

tests/backends/mysql/__init__.py

@@ -1,28 +1,19 @@
 from asynctest import TestCase
 from tortoise import Tortoise
 
-from alice.backends.mysql import MysqlDDL
-from alice.migrate import Migrate
+from alice.ddl.mysql import MysqlDDL
 
 TORTOISE_ORM = {
-    'connections': {
-        'default': 'mysql://root:123456@127.0.0.1:3306/test',
-    },
-    'apps': {
-        'models': {
-            'models': ['tests.models'],
-            'default_connection': 'default',
-        },
-    }
+    "connections": {"default": "mysql://root:123456@127.0.0.1:3306/test",},
+    "apps": {"models": {"models": ["tests.models"], "default_connection": "default",},},
 }
 
 
 class DBTestCase(TestCase):
     async def setUp(self) -> None:
         await Tortoise.init(config=TORTOISE_ORM)
-        self.client = Tortoise.get_connection('default')
+        self.client = Tortoise.get_connection("default")
         self.ddl = MysqlDDL(self.client)
-        self.migrate = Migrate(ddl=self.ddl)
 
     async def tearDown(self) -> None:
         await Tortoise.close_connections()

tests/backends/mysql/test_ddl.py

@@ -6,44 +6,50 @@ class TestDDL(DBTestCase):
     def test_create_table(self):
         ret = self.ddl.create_table(Category)
         self.assertEqual(
-            ret, """CREATE TABLE IF NOT EXISTS `category` (
+            ret,
+            """CREATE TABLE IF NOT EXISTS `category` (
     `id` INT NOT NULL PRIMARY KEY AUTO_INCREMENT,
     `slug` VARCHAR(200) NOT NULL,
     `name` VARCHAR(200) NOT NULL,
     `created_at` DATETIME(6) NOT NULL  DEFAULT CURRENT_TIMESTAMP(6),
     `user_id` INT NOT NULL COMMENT 'User',
     CONSTRAINT `fk_category_user_e2e3874c` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`) ON DELETE CASCADE
-) CHARACTER SET utf8mb4;""")
+) CHARACTER SET utf8mb4;""",
+        )
 
     def test_drop_table(self):
         ret = self.ddl.drop_table(Category)
         self.assertEqual(ret, "DROP TABLE category IF EXISTS")
 
     def test_add_column(self):
-        ret = self.ddl.add_column(Category, Category._meta.fields_map.get('name'))
+        ret = self.ddl.add_column(Category, Category._meta.fields_map.get("name"))
         self.assertEqual(ret, "ALTER TABLE category ADD `name` VARCHAR(200) NOT NULL")
 
     def test_drop_column(self):
-        ret = self.ddl.drop_column(Category, 'name')
+        ret = self.ddl.drop_column(Category, "name")
         self.assertEqual(ret, "ALTER TABLE category DROP COLUMN name")
 
     def test_add_index(self):
-        ret = self.ddl.add_index(Category, ['name'])
+        ret = self.ddl.add_index(Category, ["name"])
         self.assertEqual(ret, "ALTER TABLE category ADD  INDEX idx_category_name_8b0cb9 (`name`)")
-        ret = self.ddl.add_index(Category, ['name'], True)
-        self.assertEqual(ret, "ALTER TABLE category ADD UNIQUE INDEX uid_category_name_8b0cb9 (`name`)")
+        ret = self.ddl.add_index(Category, ["name"], True)
+        self.assertEqual(
+            ret, "ALTER TABLE category ADD UNIQUE INDEX uid_category_name_8b0cb9 (`name`)"
+        )
 
     def test_drop_index(self):
-        ret = self.ddl.drop_index(Category, ['name'])
+        ret = self.ddl.drop_index(Category, ["name"])
         self.assertEqual(ret, "ALTER TABLE category DROP INDEX idx_category_name_8b0cb9")
-        ret = self.ddl.drop_index(Category, ['name'], True)
+        ret = self.ddl.drop_index(Category, ["name"], True)
         self.assertEqual(ret, "ALTER TABLE category DROP INDEX uid_category_name_8b0cb9")
 
     def test_add_fk(self):
-        ret = self.ddl.add_fk(Category, Category._meta.fields_map.get('user'))
-        self.assertEqual(ret,
-                         "ALTER TABLE category ADD CONSTRAINT `fk_category_user_366ffa6f` FOREIGN KEY (`user`) REFERENCES `user` (`id`) ON DELETE CASCADE")
+        ret = self.ddl.add_fk(Category, Category._meta.fields_map.get("user"))
+        self.assertEqual(
+            ret,
+            "ALTER TABLE category ADD CONSTRAINT `fk_category_user_366ffa6f` FOREIGN KEY (`user`) REFERENCES `user` (`id`) ON DELETE CASCADE",
+        )
 
     def test_drop_fk(self):
-        ret = self.ddl.drop_fk(Category, Category._meta.fields_map.get('user'))
+        ret = self.ddl.drop_fk(Category, Category._meta.fields_map.get("user"))
         self.assertEqual(ret, "ALTER TABLE category DROP FOREIGN KEY fk_category_user_366ffa6f")

tests/backends/mysql/test_migrate.py

@@ -3,5 +3,4 @@ from tests.backends.mysql import DBTestCase
 
 class TestMigrate(DBTestCase):
     async def test_migrate(self):
-        self.migrate.diff_models_module('tests.models', 'tests.new_models')
-        print(self.migrate.operators)
+        pass

tests/models.py

@@ -1,6 +1,7 @@
 import datetime
 from enum import IntEnum
-from tortoise import fields, Model
+
+from tortoise import Model, fields
 
 
 class ProductType(IntEnum):
@@ -23,41 +24,41 @@ class Status(IntEnum):
 class User(Model):
     username = fields.CharField(max_length=20, unique=True)
     password = fields.CharField(max_length=200)
-    last_login = fields.DatetimeField(description='Last Login', default=datetime.datetime.now)
-    is_active = fields.BooleanField(default=True, description='Is Active')
-    is_superuser = fields.BooleanField(default=False, description='Is SuperUser')
-    avatar = fields.CharField(max_length=200, default='')
-    intro = fields.TextField(default='')
+    last_login = fields.DatetimeField(description="Last Login", default=datetime.datetime.now)
+    is_active = fields.BooleanField(default=True, description="Is Active")
+    is_superuser = fields.BooleanField(default=False, description="Is SuperUser")
+    avatar = fields.CharField(max_length=200, default="")
+    intro = fields.TextField(default="")
     created_at = fields.DatetimeField(auto_now_add=True)
     updated_at = fields.DatetimeField(auto_now=True)
 
     def __str__(self):
-        return f'{self.pk}#{self.username}'
+        return f"{self.pk}#{self.username}"
 
 
 class Category(Model):
     slug = fields.CharField(max_length=200)
     name = fields.CharField(max_length=200)
-    user = fields.ForeignKeyField('models.User', description='User')
+    user = fields.ForeignKeyField("models.User", description="User")
     created_at = fields.DatetimeField(auto_now_add=True)
 
     def __str__(self):
-        return f'{self.pk}#{self.name}'
+        return f"{self.pk}#{self.name}"
 
 
 class Product(Model):
-    categories = fields.ManyToManyField('models.Category')
+    categories = fields.ManyToManyField("models.Category")
     name = fields.CharField(max_length=50)
-    view_num = fields.IntField(description='View Num')
+    view_num = fields.IntField(description="View Num")
     sort = fields.IntField()
-    is_reviewed = fields.BooleanField(description='Is Reviewed')
-    type = fields.IntEnumField(ProductType, description='Product Type')
+    is_reviewed = fields.BooleanField(description="Is Reviewed")
+    type = fields.IntEnumField(ProductType, description="Product Type")
     image = fields.CharField(max_length=200)
     body = fields.TextField()
     created_at = fields.DatetimeField(auto_now_add=True)
 
     def __str__(self):
-        return f'{self.pk}#{self.name}'
+        return f"{self.pk}#{self.name}"
 
 
 class Config(Model):
@@ -67,4 +68,4 @@ class Config(Model):
     status: Status = fields.IntEnumField(Status, default=Status.on)
 
     def __str__(self):
-        return f'{self.pk}#{self.label}'
+        return f"{self.pk}#{self.label}"

tests/test_utils.py

@@ -1,9 +1,6 @@
 from unittest import TestCase
 
-from alice.utils import cp_models
-
 
 class TestUtils(TestCase):
-    def test_cp_models(self):
-        ret = cp_models('models.py', 'new_models.py', 'new_models')
-        print(ret)
+    def test_get_app_connection(self):
+        pass