fix regression failures

Author: wwwjfy

src/gino/crud.py

@@ -435,7 +435,6 @@ def __init__(self, **values):
 
     @classmethod
     def _init_table(cls, sub_cls):
-        rv = Model._init_table(sub_cls)
         for each_cls in sub_cls.__mro__[::-1]:
             for k, v in each_cls.__dict__.items():
                 if isinstance(v, json_support.JSONProperty):
@@ -444,6 +443,7 @@ def _init_table(cls, sub_cls):
                             'Requires "{}" JSON[B] column.'.format(v.prop_name)
                         )
                     v.name = k
+        rv = Model._init_table(sub_cls)
         if rv is not None:
             rv.__model__ = weakref.ref(sub_cls)
         return rv
@@ -813,7 +813,8 @@ async def _query_and_update(bind, item, query, cols, execution_opts):
         else:
             conn = bind
         try:
-            lastrowid, affected_rows = await conn.all(query)
+            lastrowid, affected_rows = await conn.all(
+                query.execution_options(return_affected_rows=True))
             if not lastrowid and not affected_rows:
                 raise NoSuchRowError()
             # It's insertion and primary key is AUTO_INCREMENT

src/gino/dialects/base.py

@@ -217,8 +217,11 @@ async def execute(self, one=False, return_model=True, status=False):
             )
             if (not self.context.dialect.support_returning and
                     (self.context.isinsert or self.context.isupdate)):
-                # TODO: a better way to return execution status
-                return context.get_lastrowid(), context.get_affected_rows()
+                if self.context.execution_options.get(
+                    'return_affected_rows', False
+                ):
+                    return context.get_lastrowid(), context.get_affected_rows()
+                return context.get_lastrowid()
             item = context.process_rows(rows, return_model=return_model)
             if one:
                 if item:
@@ -284,9 +287,9 @@ def timeout(self):
     def loader(self):
         return self._compiled_first_opt("loader", None)
 
-    # @util.memoized_property
-    # def return_lastrowid(self):
-    #     return self._compiled_first_opt("return_lastrowid", False)
+    @util.memoized_property
+    def return_affected_rows(self):
+        return self._compiled_first_opt("return_affected_rows", False)
 
     def process_rows(self, rows, return_model=True):
         if not rows: