Merge pull request #5 from zpoint/develop

ON UPDATE support

Author: zpoint

sql_convertor/__init__.py

@@ -13,4 +13,4 @@
 __all__ = ["ParserFactory", "OutPutFactory"]
 
 
-__version__ = '0.0.7'
+__version__ = '0.0.8'

sql_convertor/source/sql/helper.py

@@ -107,3 +107,6 @@ def parse_table_def(self, s, loc, tok):
 
     def parse_char_set(self, s, loc, tok):
         return {"char_set": tok[0]}
+
+    def on_action(self, s, loc, tok):
+        return {"default": tok[1]["field_name"]}

sql_convertor/source/sql/parser.py

@@ -37,6 +37,7 @@ def generate_parser(self):
         default = Literal("DEFAULT") + (string_literal | number | Literal("NULL") | keyword)
         comment = Literal("COMMENT") + string_literal
         auto_inc = Literal("AUTO_INCREMENT")
+        on_action = Literal("ON UPDATE") + keyword
 
         enclosing_int.setParseAction(self.helper.parse_field_length)
         enclosing_func.setParseAction(self.helper.parse_field_length_func)
@@ -47,8 +48,9 @@ def generate_parser(self):
         auto_inc.setParseAction(self.helper.parse_auto_inc)
         default.setParseAction(self.helper.parse_default_value)
         comment.setParseAction(self.helper.parse_comment)
+        on_action.setParseAction(self.helper.on_action)
         #   `c_add_dt` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
-        col_stm = keyword + type_ + Optional(enclosing_int | enclosing_func) + Optional(nullable) + Optional(auto_inc) + Optional(char_set) + Optional(default) + Optional(comment)
+        col_stm = keyword + type_ + Optional(enclosing_int | enclosing_func) + Optional(nullable) + Optional(auto_inc) + Optional(char_set) + Optional(default) + Optional(on_action) + Optional(comment)
         col_stm.setParseAction(self.helper.parse_col)
 
         # key

sql_convertor/tests/base.py

@@ -12,6 +12,7 @@
   `c_is_delete` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否删除',
   `c_statement` VARCHAR(1000) CHARACTER SET UTF8MB4 COLLATE UTF8MB4_BIN DEFAULT '' COMMENT '声明字段',
   `c_record_time` timestamp NULL DEFAULT CURRENT_TIMESTAMP COMMENT '记录时间',
+  `c_test_update_dt` timestamp NULL DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间2',
   PRIMARY KEY (`c_id`),
   KEY `ix_company` (`c_company_id`) USING BTREE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='记录表';
@@ -99,7 +100,14 @@
                 null=True,
                 default=datetime.datetime.now,
                 column_name="c_record_time")
+        """,
         """
+            test_update_dt = peewee.TimestampField(
+                verbose_name="修改时间2",
+                null=True,
+                default=datetime.datetime.now,
+                column_name="c_test_update_dt")
+        """,
     ],
     [
         """
@@ -138,7 +146,8 @@ def to_dict(self):
                 "add_dt": self.add_dt,
                 "is_delete": self.is_delete,
                 "statement": self.statement,
-                "record_time": self.record_time
+                "record_time": self.record_time,
+                "test_update_dt": self.test_update_dt
             }
     """,
     """

sql_convertor/tests/test_sql_parser.py

@@ -86,3 +86,10 @@ def test_c_record_time(self):
             'comment': '记录时间', 'default': 'CURRENT_TIMESTAMP', 'field_name': 'C_RECORD_TIME',
             'field_type': 'TIMESTAMP', 'null': True
         }
+
+    def test_test_update_dt(self):
+        assert "C_TEST_UPDATE_DT" in self.field_name_row_map
+        assert self.field_name_row_map["C_TEST_UPDATE_DT"] == {
+            'comment': '修改时间2', 'default': 'CURRENT_TIMESTAMP', 'field_name': 'C_TEST_UPDATE_DT',
+            'field_type': 'TIMESTAMP', 'null': True
+        }