From e4032069a5d9ed32610b579ef7cf8de12b1808aa Mon Sep 17 00:00:00 2001
From: heimoshuiyu <heimoshuiyu@gmail.com>
Date: Fri, 4 Nov 2022 21:27:46 +0800
Subject: [PATCH] fix postgres insert on conflict not returning id

---
 pkg/database/method.go | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/pkg/database/method.go b/pkg/database/method.go
index 6878816..6294f1a 100644
--- a/pkg/database/method.go
+++ b/pkg/database/method.go
@@ -168,6 +168,7 @@ func (database *Database) Walk(root string, pattern []string, tagIDs []int64, us
 	insertFileStmt := tx.Stmt(database.stmt.insertFile)
 	putTagOnFileStmt := tx.Stmt(database.stmt.putTagOnFile)
 	findFolderStmt := tx.Stmt(database.stmt.findFolder)
+	findFileStmt := tx.Stmt(database.stmt.findFile)
 
 	err = filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
@@ -205,11 +206,25 @@ func (database *Database) Walk(root string, pattern []string, tagIDs []int64, us
 				}
 			}
 		}
-		result, err := insertFileStmt.Query(folderID, filename, filename, info.Size())
+
+		// try find file id
+		var fileID int64
+		result, err := findFileStmt.Query(folderID, filename)
+		if err != nil {
+			return err
+		}
+		for result.Next() {
+			err = result.Scan(&fileID)
+			if err != nil {
+				return err
+			}
+		}
+
+		// insert new file
+		result, err = insertFileStmt.Query(folderID, filename, filename, info.Size())
 		if err != nil {
 			return err
 		}
-		var fileID int64
 		for result.Next() {
 			err = result.Scan(&fileID)
 			if err != nil {