cleanup

orm.go

@@ -39,10 +39,10 @@ type ConnectionConfig struct {
 	Name string
 	// Which driver to be used for your connection, you can name [mysql, sqlite3, postgres]
 	Driver string
-	// Which connection string to be passed as second argument to sql.Open(driver, connectionString)
-	ConnectionString string
+	// Which connection string to be passed as second argument to sql.Open(driver, DSN)
+	DSN string
 	// If you already have an active database connection configured pass it in this value and
-	// do not pass Driver and ConnectionString fields.
+	// do not pass Driver and DSN fields.
 	DB *sql.DB
 	// Which dialect of sql to generate queries for, you don't need it most of the times when you are using
 	// traditional databases such as mysql, sqlite3, postgres.
@@ -57,6 +57,7 @@ type ConnectionConfig struct {
 // SetupConnection declares a new connection for ORM.
 func SetupConnection(conf ConnectionConfig) error {
 	// configure logger
+	// TODO: remove logger
 	var err error
 	globalLogger, err = newZapLogger(LogLevelDev)
 	if err != nil {
@@ -75,7 +76,7 @@ func SetupConnection(conf ConnectionConfig) error {
 		if err != nil {
 			return err
 		}
-		db, err = getDB(conf.Driver, conf.ConnectionString)
+		db, err = sql.Open(conf.Driver, conf.DSN)
 		if err != nil {
 			return err
 		}
@@ -124,10 +125,6 @@ type Entity interface {
 	ConfigureEntity(e *EntityConfigurator)
 }
 
-func getDB(driver string, connectionString string) (*sql.DB, error) {
-	return sql.Open(driver, connectionString)
-}
-
 func getDialect(driver string) (*Dialect, error) {
 	switch driver {
 	case "mysql":
@@ -533,11 +530,6 @@ func addProperty(to Entity, items ...Entity) error {
 
 }
 
-// addBelongsToMany(Post, Category)
-func addBelongsToMany(to Entity, items ...Entity) error {
-	return nil
-}
-
 // Query creates a new QueryBuilder for given type parameter, sets dialect and table as well.
 func Query[E Entity]() *QueryBuilder[E] {
 	q := NewQueryBuilder[E]()

orm_test.go

@@ -93,9 +93,9 @@ func (c Category) Posts() ([]Post, error) {
 
 func setup(t *testing.T) {
 	err := orm.SetupConnection(orm.ConnectionConfig{
-		Driver:           "sqlite3",
-		ConnectionString: ":memory:",
-		Entities:         []orm.Entity{&Post{}, &Comment{}, &Category{}, &HeaderPicture{}},
+		Driver:   "sqlite3",
+		DSN:      ":memory:",
+		Entities: []orm.Entity{&Post{}, &Comment{}, &Category{}, &HeaderPicture{}},
 	})
 	_, err = orm.GetConnection("default").Connection.Exec(`CREATE TABLE IF NOT EXISTS posts (id INTEGER PRIMARY KEY, body text, created_at TIMESTAMP, updated_at TIMESTAMP, deleted_at TIMESTAMP)`)
 	_, err = orm.GetConnection("default").Connection.Exec(`CREATE TABLE IF NOT EXISTS emails (id INTEGER PRIMARY KEY, post_id INTEGER, email text)`)

schema_test.go

@@ -8,8 +8,8 @@ import (
 
 func setup(t *testing.T) {
 	err := SetupConnection(ConnectionConfig{
-		Driver:           "sqlite3",
-		ConnectionString: ":memory:",
+		Driver: "sqlite3",
+		DSN:    ":memory:",
 	})
 	// orm.Schematic()
 	_, err = GetConnection("default").Connection.Exec(`CREATE TABLE IF NOT EXISTS posts (id INTEGER PRIMARY KEY, body text, created_at TIMESTAMP, updated_at TIMESTAMP, deleted_at TIMESTAMP)`)