improve gfile.CopyDir function; add Model function for gdb.Model

.example/other/config.toml

@@ -1,4 +1,7 @@
 
+[database]
+	debug = true
+    link  = "mysql:root:12345678@tcp(127.0.0.1:3306)/test"
 
 [redis]
     default  = "127.0.0.1:6379,0"

.example/other/test.go

@@ -1,17 +1,13 @@
 package main
 
 import (
-	"github.com/gogf/gf/net/ghttp"
+	"github.com/gogf/gf/frame/g"
 )
 
 func main() {
-	s := ghttp.GetServer()
-	s.BindHandler("/log/path", func(r *ghttp.Request) {
-		r.Response.Writeln("请到/tmp/gf.log目录查看日志")
-	})
-	s.SetLogPath("/tmp/gf.log")
-	s.SetAccessLogEnabled(true)
-	s.SetErrorLogEnabled(true)
-	s.SetPort(8199)
-	s.Run()
+	db := g.DB()
+	// 开启调试模式，以便于记录所有执行的SQL
+	db.SetDebug(true)
+
+	db.Table("user").Delete("score < ", 60)
 }

database/gdb/gdb_model.go

@@ -80,8 +80,15 @@ func (bs *dbBase) Table(table string) *Model {
 	}
 }
 
+// Model is alias of dbBase.Table.
+// See dbBase.Table.
+func (bs *dbBase) Model(tables string) *Model {
+	return bs.db.Table(tables)
+}
+
 // From is alias of dbBase.Table.
 // See dbBase.Table.
+// Deprecated.
 func (bs *dbBase) From(tables string) *Model {
 	return bs.db.Table(tables)
 }
@@ -103,8 +110,15 @@ func (tx *TX) Table(table string) *Model {
 	}
 }
 
+// Model is alias of tx.Table.
+// See tx.Table.
+func (tx *TX) Model(tables string) *Model {
+	return tx.Table(tables)
+}
+
 // From is alias of tx.Table.
 // See tx.Table.
+// Deprecated.
 func (tx *TX) From(tables string) *Model {
 	return tx.Table(tables)
 }
@@ -873,6 +887,15 @@ func (m *Model) FindCount(where ...interface{}) (int, error) {
 	return m.Count()
 }
 
+// FindScan retrieves and returns the record/records by Model.WherePri and Model.Scan.
+// Also see Model.WherePri and Model.Scan.
+func (m *Model) FindScan(pointer interface{}, where ...interface{}) error {
+	if len(where) > 0 {
+		return m.WherePri(where[0], where[1:]...).Scan(pointer)
+	}
+	return m.Scan(pointer)
+}
+
 // Chunk iterates the table with given size and callback function.
 func (m *Model) Chunk(limit int, callback func(result Result, err error) bool) {
 	page := m.start

os/gfile/gfile.go

@@ -10,9 +10,6 @@ package gfile
 import (
 	"bytes"
 	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/user"
@@ -160,107 +157,6 @@ func Rename(src string, dst string) error {
 	return Move(src, dst)
 }
 
-// Copy file/directory from <src> to <dst>.
-//
-// If <src> is file, it calls CopyFile to implements copy feature,
-// or else it calls CopyDir.
-func Copy(src string, dst string) error {
-	if IsFile(src) {
-		return CopyFile(src, dst)
-	}
-	return CopyDir(src, dst)
-}
-
-// CopyFile copies the contents of the file named src to the file named
-// by dst. The file will be created if it does not already exist. If the
-// destination file exists, all it's contents will be replaced by the contents
-// of the source file. The file mode will be copied from the source and
-// the copied data is synced/flushed to stable storage.
-// Thanks: https://gist.github.com/r0l1/92462b38df26839a3ca324697c8cba04
-func CopyFile(src, dst string) (err error) {
-	in, err := os.Open(src)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if e := in.Close(); e != nil {
-			err = e
-		}
-	}()
-	out, err := os.Create(dst)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if e := out.Close(); e != nil {
-			err = e
-		}
-	}()
-	_, err = io.Copy(out, in)
-	if err != nil {
-		return
-	}
-	err = out.Sync()
-	if err != nil {
-		return
-	}
-	si, err := os.Stat(src)
-	if err != nil {
-		return
-	}
-	err = os.Chmod(dst, si.Mode())
-	if err != nil {
-		return
-	}
-	return
-}
-
-// CopyDir recursively copies a directory tree, attempting to preserve permissions.
-// Source directory must exist, destination directory must *not* exist.
-// Symlinks are ignored and skipped.
-func CopyDir(src string, dst string) (err error) {
-	src = filepath.Clean(src)
-	dst = filepath.Clean(dst)
-	si, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-	if !si.IsDir() {
-		return fmt.Errorf("source is not a directory")
-	}
-	if Exists(dst) {
-		return fmt.Errorf("destination already exists")
-	}
-	err = os.MkdirAll(dst, si.Mode())
-	if err != nil {
-		return
-	}
-	entries, err := ioutil.ReadDir(src)
-	if err != nil {
-		return
-	}
-	for _, entry := range entries {
-		srcPath := filepath.Join(src, entry.Name())
-		dstPath := filepath.Join(dst, entry.Name())
-		if entry.IsDir() {
-			err = CopyDir(srcPath, dstPath)
-			if err != nil {
-				return
-			}
-		} else {
-			// Skip symlinks.
-			if entry.Mode()&os.ModeSymlink != 0 {
-				continue
-			}
-			err = CopyFile(srcPath, dstPath)
-			if err != nil {
-				return
-			}
-		}
-	}
-	return
-}
-
 // DirNames returns sub-file names of given directory <path>.
 // Note that the returned names are NOT absolute paths.
 func DirNames(path string) ([]string, error) {
@@ -318,7 +214,7 @@ func IsReadable(path string) bool {
 
 // IsWritable checks whether given <path> is writable.
 //
-// @TODO improve performance; use golang.org/x/sys to cross-plat-form
+// TODO improve performance; use golang.org/x/sys to cross-plat-form
 func IsWritable(path string) bool {
 	result := true
 	if IsDir(path) {

os/gfile/gfile_copy.go

@@ -0,0 +1,115 @@
+// Copyright 2019 gf Author(https://github.com/gogf/gf). All Rights Reserved.
+//
+// This Source Code Form is subject to the terms of the MIT License.
+// If a copy of the MIT was not distributed with this file,
+// You can obtain one at https://github.com/gogf/gf.
+
+package gfile
+
+import (
+	"fmt"
+	"io"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+)
+
+// Copy file/directory from <src> to <dst>.
+//
+// If <src> is file, it calls CopyFile to implements copy feature,
+// or else it calls CopyDir.
+func Copy(src string, dst string) error {
+	if IsFile(src) {
+		return CopyFile(src, dst)
+	}
+	return CopyDir(src, dst)
+}
+
+// CopyFile copies the contents of the file named src to the file named
+// by dst. The file will be created if it does not already exist. If the
+// destination file exists, all it's contents will be replaced by the contents
+// of the source file. The file mode will be copied from the source and
+// the copied data is synced/flushed to stable storage.
+// Thanks: https://gist.github.com/r0l1/92462b38df26839a3ca324697c8cba04
+func CopyFile(src, dst string) (err error) {
+	in, err := os.Open(src)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if e := in.Close(); e != nil {
+			err = e
+		}
+	}()
+	out, err := os.Create(dst)
+	if err != nil {
+		return
+	}
+	defer func() {
+		if e := out.Close(); e != nil {
+			err = e
+		}
+	}()
+	_, err = io.Copy(out, in)
+	if err != nil {
+		return
+	}
+	err = out.Sync()
+	if err != nil {
+		return
+	}
+	si, err := os.Stat(src)
+	if err != nil {
+		return
+	}
+	err = os.Chmod(dst, si.Mode())
+	if err != nil {
+		return
+	}
+	return
+}
+
+// CopyDir recursively copies a directory tree, attempting to preserve permissions.
+//
+// Note that, the sSource directory must exist and symlinks are ignored and skipped.
+func CopyDir(src string, dst string) (err error) {
+	src = filepath.Clean(src)
+	dst = filepath.Clean(dst)
+	si, err := os.Stat(src)
+	if err != nil {
+		return err
+	}
+	if !si.IsDir() {
+		return fmt.Errorf("source is not a directory")
+	}
+	if !Exists(dst) {
+		err = os.MkdirAll(dst, si.Mode())
+		if err != nil {
+			return
+		}
+	}
+	entries, err := ioutil.ReadDir(src)
+	if err != nil {
+		return
+	}
+	for _, entry := range entries {
+		srcPath := filepath.Join(src, entry.Name())
+		dstPath := filepath.Join(dst, entry.Name())
+		if entry.IsDir() {
+			err = CopyDir(srcPath, dstPath)
+			if err != nil {
+				return
+			}
+		} else {
+			// Skip symlinks.
+			if entry.Mode()&os.ModeSymlink != 0 {
+				continue
+			}
+			err = CopyFile(srcPath, dstPath)
+			if err != nil {
+				return
+			}
+		}
+	}
+	return
+}