revert postgres package refactor (#1796)

* Revert "refactor: move postgres to pg package (#1781)"

This reverts commit ba8ac974aa.

* remove pg, use postgres

core/collection/timingwheel.go

@@ -65,7 +65,8 @@ type (
 // NewTimingWheel returns a TimingWheel.
 func NewTimingWheel(interval time.Duration, numSlots int, execute Execute) (*TimingWheel, error) {
 	if interval <= 0 || numSlots <= 0 || execute == nil {
-		return nil, fmt.Errorf("interval: %v, slots: %d, execute: %p", interval, numSlots, execute)
+		return nil, fmt.Errorf("interval: %v, slots: %d, execute: %p",
+			interval, numSlots, execute)
 	}
 
 	return newTimingWheelWithClock(interval, numSlots, execute, timex.NewTicker(interval))

core/stores/pg/postgresql.go

@@ -1,14 +0,0 @@
-package pg
-
-import (
-	// imports the driver, don't remove this comment, golint requires.
-	_ "github.com/lib/pq"
-	"github.com/zeromicro/go-zero/core/stores/sqlx"
-)
-
-const postgresDriverName = "postgres"
-
-// New returns a postgres connection.
-func New(datasource string, opts ...sqlx.SqlOption) sqlx.SqlConn {
-	return sqlx.NewSqlConn(postgresDriverName, datasource, opts...)
-}

core/stores/pg/postgresql_test.go

@@ -1,11 +0,0 @@
-package pg
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestPostgreSql(t *testing.T) {
-	assert.NotNil(t, New("postgre"))
-}

core/stores/postgres/postgresql.go

@@ -1,7 +1,14 @@
 package postgres
 
-import "github.com/zeromicro/go-zero/core/stores/pg"
+import (
+	// imports the driver, don't remove this comment, golint requires.
+	_ "github.com/lib/pq"
+	"github.com/zeromicro/go-zero/core/stores/sqlx"
+)
 
-// New creates a new postgresql store.
+const postgresDriverName = "postgres"
-// Deprecated: use pg.New instead.
+
-var New = pg.New
+// New returns a postgres connection.
+func New(datasource string, opts ...sqlx.SqlOption) sqlx.SqlConn {
+	return sqlx.NewSqlConn(postgresDriverName, datasource, opts...)
+}