remove depecated functions from package ghttp

database/gdb/gdb.go

@@ -265,6 +265,7 @@ type (
 )
 
 const (
+	defaultModelSafe        = false
 	queryTypeNormal         = 0
 	queryTypeCount          = 1
 	unionTypeNormal         = 0

database/gdb/gdb_model.go

@@ -132,7 +132,7 @@ func (c *Core) Model(tableNameQueryOrStruct ...interface{}) *Model {
 			tableStr = c.QuotePrefixTableName(tableNames[0])
 		}
 	}
-	return &Model{
+	m := &Model{
 		db:         c.db,
 		tablesInit: tableStr,
 		tables:     tableStr,
@@ -142,6 +142,10 @@ func (c *Core) Model(tableNameQueryOrStruct ...interface{}) *Model {
 		filter:     true,
 		extraArgs:  extraArgs,
 	}
+	if defaultModelSafe {
+		m.safe = true
+	}
+	return m
 }
 
 // Raw creates and returns a model based on a raw sql not a table.
@@ -154,7 +158,7 @@ func (c *Core) Raw(rawSql string, args ...interface{}) *Model {
 	return model
 }
 
-// Raw creates and returns a model based on a raw sql not a table.
+// Raw sets current model as a raw sql model.
 // Example:
 //     db.Raw("SELECT * FROM `user` WHERE `name` = ?", "john").Scan(&result)
 // See Core.Raw.
@@ -169,7 +173,7 @@ func (tx *TX) Raw(rawSql string, args ...interface{}) *Model {
 	return tx.Model().Raw(rawSql, args...)
 }
 
-// With creates and returns an ORM model based on meta data of given object.
+// With creates and returns an ORM model based on metadata of given object.
 func (c *Core) With(objects ...interface{}) *Model {
 	return c.db.Model().With(objects...)
 }

database/gdb/gdb_model_condition.go

@@ -236,16 +236,6 @@ func (m *Model) WhereOrNotNull(columns ...string) *Model {
 	return model
 }
 
-// Group sets the "GROUP BY" statement for the model.
-func (m *Model) Group(groupBy ...string) *Model {
-	if len(groupBy) > 0 {
-		model := m.getModel()
-		model.groupBy = m.db.GetCore().QuoteString(gstr.Join(groupBy, ","))
-		return model
-	}
-	return m
-}
-
 // And adds "AND" condition to the where statement.
 // Deprecated, use Where instead.
 func (m *Model) And(where interface{}, args ...interface{}) *Model {
@@ -267,11 +257,17 @@ func (m *Model) Or(where interface{}, args ...interface{}) *Model {
 	return m.WhereOr(where, args...)
 }
 
-// GroupBy is alias of Model.Group.
-// See Model.Group.
-// Deprecated, use Group instead.
-func (m *Model) GroupBy(groupBy string) *Model {
-	return m.Group(groupBy)
+// Group sets the "GROUP BY" statement for the model.
+func (m *Model) Group(groupBy ...string) *Model {
+	if len(groupBy) == 0 {
+		return m
+	}
+	model := m.getModel()
+	if model.groupBy != "" {
+		model.groupBy += ","
+	}
+	model.groupBy = model.db.GetCore().QuoteString(strings.Join(groupBy, ","))
+	return model
 }
 
 // Order sets the "ORDER BY" statement for the model.
@@ -283,7 +279,7 @@ func (m *Model) Order(orderBy ...string) *Model {
 	if model.orderBy != "" {
 		model.orderBy += ","
 	}
-	model.orderBy = m.db.GetCore().QuoteString(strings.Join(orderBy, " "))
+	model.orderBy = model.db.GetCore().QuoteString(strings.Join(orderBy, " "))
 	return model
 }
 
@@ -292,12 +288,7 @@ func (m *Model) OrderAsc(column string) *Model {
 	if len(column) == 0 {
 		return m
 	}
-	model := m.getModel()
-	if model.orderBy != "" {
-		model.orderBy += ","
-	}
-	model.orderBy = m.db.GetCore().QuoteWord(column) + " ASC"
-	return model
+	return m.Order(column + " ASC")
 }
 
 // OrderDesc sets the "ORDER BY xxx DESC" statement for the model.
@@ -305,12 +296,7 @@ func (m *Model) OrderDesc(column string) *Model {
 	if len(column) == 0 {
 		return m
 	}
-	model := m.getModel()
-	if model.orderBy != "" {
-		model.orderBy += ","
-	}
-	model.orderBy = m.db.GetCore().QuoteWord(column) + " DESC"
-	return model
+	return m.Order(column + " DESC")
 }
 
 // OrderRandom sets the "ORDER BY RANDOM()" statement for the model.
@@ -320,13 +306,6 @@ func (m *Model) OrderRandom() *Model {
 	return model
 }
 
-// OrderBy is alias of Model.Order.
-// See Model.Order.
-// Deprecated, use Order instead.
-func (m *Model) OrderBy(orderBy string) *Model {
-	return m.Order(orderBy)
-}
-
 // Limit sets the "LIMIT" statement for the model.
 // The parameter `limit` can be either one or two number, if passed two number is passed,
 // it then sets "LIMIT limit[0],limit[1]" statement for the model, or else it sets "LIMIT limit[0]"

database/gdb/gdb_z_mysql_method_test.go

@@ -1313,14 +1313,14 @@ func Test_Model_InnerJoin(t *testing.T) {
 
 		t.Assert(n, 5)
 
-		result, err := db.Model(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").OrderBy("u1.id").Select()
+		result, err := db.Model(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").Order("u1.id").Select()
 		if err != nil {
 			t.Fatal(err)
 		}
 
 		t.Assert(len(result), 5)
 
-		result, err = db.Model(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > ?", 1).OrderBy("u1.id").Select()
+		result, err = db.Model(table1+" u1").InnerJoin(table2+" u2", "u1.id = u2.id").Where("u1.id > ?", 1).Order("u1.id").Select()
 		if err != nil {
 			t.Fatal(err)
 		}

database/gdb/gdb_z_mysql_model_test.go

@@ -435,6 +435,7 @@ func Test_Model_Clone(t *testing.T) {
 	table := createInitTable()
 	defer dropTable(table)
 
+	db.SetDebug(true)
 	gtest.C(t, func(t *gtest.T) {
 		md := db.Model(table).Where("id IN(?)", g.Slice{1, 3})
 		count, err := md.Count()
@@ -1225,7 +1226,7 @@ func Test_Model_GroupBy(t *testing.T) {
 	defer dropTable(table)
 
 	gtest.C(t, func(t *gtest.T) {
-		result, err := db.Model(table).GroupBy("id").Select()
+		result, err := db.Model(table).Group("id").All()
 		t.AssertNil(err)
 		t.Assert(len(result), TableSize)
 		t.Assert(result[0]["nickname"].String(), "name_1")