]> source.dussan.org Git - gitea.git/commitdiff
fix updated update on public key (#2514)
authorLunny Xiao <xiaolunwen@gmail.com>
Fri, 15 Sep 2017 03:23:48 +0000 (11:23 +0800)
committerGitHub <noreply@github.com>
Fri, 15 Sep 2017 03:23:48 +0000 (11:23 +0800)
* fix updated update on public key

* update vendor.json

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
* fix root path

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
vendor/github.com/go-xorm/xorm/session_update.go
vendor/vendor.json

index 6e9d11681c4f44a4d6cd36b23b42ab98c097be9e..4e0f656db3ed1059811bc833420e168ac1fea3d8 100644 (file)
@@ -202,17 +202,19 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
        table := session.statement.RefTable
 
        if session.statement.UseAutoTime && table != nil && table.Updated != "" {
-               colNames = append(colNames, session.engine.Quote(table.Updated)+" = ?")
-               col := table.UpdatedColumn()
-               val, t := session.engine.NowTime2(col.SQLType.Name)
-               args = append(args, val)
-
-               var colName = col.Name
-               if isStruct {
-                       session.afterClosures = append(session.afterClosures, func(bean interface{}) {
-                               col := table.GetColumn(colName)
-                               setColumnTime(bean, col, t)
-                       })
+               if _, ok := session.statement.columnMap[strings.ToLower(table.Updated)]; !ok {
+                       colNames = append(colNames, session.engine.Quote(table.Updated)+" = ?")
+                       col := table.UpdatedColumn()
+                       val, t := session.engine.NowTime2(col.SQLType.Name)
+                       args = append(args, val)
+
+                       var colName = col.Name
+                       if isStruct {
+                               session.afterClosures = append(session.afterClosures, func(bean interface{}) {
+                                       col := table.GetColumn(colName)
+                                       setColumnTime(bean, col, t)
+                               })
+                       }
                }
        }
 
index 7c4c157f3958441eb9bbb5b345f0b09a5477d3d2..75f7c888c5948326104fcc0e9fbececfae18b552 100644 (file)
                        "revisionTime": "2016-08-11T02:11:45Z"
                },
                {
-                       "checksumSHA1": "SoZDnkd5NdwE0g4MY1nTAl8ZtPo=",
+                       "checksumSHA1": "lAzHeuH461JyawhsGLi27JpWsgs=",
                        "path": "github.com/go-xorm/xorm",
-                       "revision": "c29485f954ed6495861c0098f9a1642a467299c8",
-                       "revisionTime": "2017-09-10T12:58:18Z"
+                       "revision": "3101e3bc440f16f151687d97bce94da063c486f5",
+                       "revisionTime": "2017-09-15T01:51:15Z"
                },
                {
                        "checksumSHA1": "1ft/4j5MFa7C9dPI9whL03HSUzk=",