time default

Author: folospace

orm/create_struct.go

@@ -80,7 +80,6 @@ func (q *Query[T]) CreateStruct(file ...string) error {
         structFile = file[0]
     } else {
         _, fs, _, _ := runtime.Caller(1)
-        fmt.Println(fs)
         structFile = fs
     }
 

orm/create_table.go

@@ -12,6 +12,7 @@ const primaryKeyPrefix = "primary"
 const uniqueKeyPrefix = "unique"
 const keyPrefix = "index"
 const nullPrefix = "null"
+const notNullPrefix = "not null"
 const autoIncrementPrefix = "auto_increment"
 const createdAtColumn = "created_at"
 const updatedAtColumn = "updated_at"
@@ -143,7 +144,6 @@ func generateColumnStrings(dbColums []dBColumn) []string {
         } else {
             words = append(words, "not null")
         }
-
         //add default
         if v.AutoIncrement {
             words = append(words, "auto_increment")
@@ -274,14 +274,16 @@ func getMigrateColumns(table *queryTable) []dBColumn {
         }
 
         if column.Name == createdAtColumn {
-            column.Type = "timestamp"
+            column.Null = false
+            column.Type = "datetime"
             column.Default = "CURRENT_TIMESTAMP"
         } else if column.Name == updatedAtColumn {
-            column.Type = "timestamp"
+            column.Null = false
+            column.Type = "datetime"
             column.Default = "CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP"
         } else if column.Name == deletedAtColumn {
             column.Null = true
-            column.Type = "timestamp"
+            column.Type = "datetime"
             column.Default = "Null"
         }
 
@@ -297,16 +299,24 @@ func getMigrateColumns(table *queryTable) []dBColumn {
                 }
             }
         }
+        if strings.ToLower(column.Default) == "null" {
+            column.Null = true
+        }
 
         if ormTags[0] != "" {
             overideColumn := dBColumn{}
 
+            overrideNull := false
             for k, v := range ormTags {
                 if k == 0 {
                     continue
                 }
                 if v == nullPrefix {
+                    overrideNull = true
                     overideColumn.Null = true
+                } else if v == notNullPrefix {
+                    overrideNull = true
+                    overideColumn.Null = false
                 } else if v == autoIncrementPrefix {
                     overideColumn.AutoIncrement = true
                 } else if strings.HasPrefix(v, primaryKeyPrefix) {
@@ -328,7 +338,9 @@ func getMigrateColumns(table *queryTable) []dBColumn {
                 }
             }
 
-            column.Null = overideColumn.Null
+            if overrideNull {
+                column.Null = overideColumn.Null
+            }
             column.AutoIncrement = overideColumn.AutoIncrement
             column.Primary = overideColumn.Primary
             if overideColumn.Type != "" {
@@ -358,9 +370,11 @@ func getMigrateColumns(table *queryTable) []dBColumn {
 
 func getTypeAndDefault(val reflect.Value) (string, string) {
     var types, defaults string
+    typ := val.Type()
     kind := val.Kind()
     if kind == reflect.Ptr {
-        kind = val.Elem().Kind()
+        kind = val.Type().Elem().Kind()
+        typ = typ.Elem()
     }
     switch kind {
     case reflect.Bool, reflect.Int8:
@@ -397,11 +411,21 @@ func getTypeAndDefault(val reflect.Value) (string, string) {
         types = "varchar(255)"
     default:
         if _, ok := val.Interface().(*time.Time); ok {
-            types = "timestamp"
+            types = "datetime"
         } else if _, ok := val.Interface().(time.Time); ok {
-            types = "timestamp"
+            types = "datetime"
         } else {
-            types = "varchar(255)"
+            realVal := reflect.New(typ)
+            if _, ok := realVal.Elem().Field(0).Interface().(*time.Time); ok {
+                types = "datetime"
+            } else if _, ok := realVal.Elem().Field(0).Interface().(time.Time); ok {
+                types = "datetime"
+            } else {
+                types = "varchar(255)"
+            }
+        }
+        if types == "datetime" {
+            defaults = "current_timestamp"
         }
     }
     return types, defaults

orm/query.go

@@ -90,6 +90,10 @@ func (q *Query[T]) Alias(alias string) *Query[T] {
     q.tables[0].alias = alias
     return q
 }
+func (q *Query[T]) TableName(override string) *Query[T] {
+    q.tables[0].overrideTableName = override
+    return q
+}
 
 //query raw, tablename can be empty
 func newQueryRaw(tableName string, writeAndReadDbs ...*sql.DB) *Query[*SubQuery] {

orm/query_table.go

@@ -6,15 +6,16 @@ import (
 )
 
 type queryTable struct {
-    table           Table
-    tableStruct     reflect.Value
-    tableStructType reflect.Type
-    ormFields       map[any]string
-    joinType        JoinType //(left|right) join
-    joinCondition   where
-    alias           string
-    rawSql          string
-    bindings        []any
+    table             Table
+    tableStruct       reflect.Value
+    tableStructType   reflect.Type
+    ormFields         map[any]string
+    joinType          JoinType //(left|right) join
+    joinCondition     where
+    alias             string
+    overrideTableName string //override table name
+    rawSql            string
+    bindings          []any
 }
 
 func (q queryTable) getAlias() string {
@@ -42,6 +43,9 @@ func (q queryTable) getTableNameAndAlias() string {
 }
 
 func (q queryTable) getTableName() string {
+    if q.overrideTableName != "" {
+        return q.overrideTableName
+    }
     if q.table.TableName() != "" {
         if q.table.DatabaseName() != "" {
             return q.table.DatabaseName() + "." + q.table.TableName()

orm/reflect.go

@@ -219,18 +219,42 @@ func getStructFieldWithDefaultTime(obj any) (map[int]any, error) {
         return nil, ErrParamElemKindMustBeStruct
     }
     ret := make(map[int]any)
-
+    now := time.Now()
     for i := 0; i < tableStruct.NumField(); i++ {
-        defaultVar := tableStructType.Field(i).Tag.Get("default")
-        if defaultVar == "" {
-            continue
-        }
-
         v := tableStruct.Field(i)
         if v.CanInterface() {
+            defaultVar := tableStructType.Field(i).Tag.Get("default")
+            name := tableStructType.Field(i).Tag.Get("json")
+            ormName := tableStructType.Field(i).Tag.Get("orm")
+            ormName = strings.Split(ormName, ",")[0]
+            if ormName != "" {
+                name = ormName
+            }
+
             if _, ok := v.Interface().(time.Time); ok {
-                if strings.Contains(strings.ToLower(defaultVar), "current_timestamp") {
-                    ret[i] = time.Now()
+                lowerDefault := strings.ToLower(defaultVar)
+                if strings.Contains(lowerDefault, "current_timestamp") {
+                    ret[i] = now
+                } else if lowerDefault == "" {
+                    if name != deletedAtColumn {
+                        ret[i] = now
+                    }
+                } else if lowerDefault != "null" {
+                    ret[i] = defaultVar
+                }
+            } else if v.Kind() == reflect.Struct {
+                realVal := reflect.New(v.Type())
+                if _, ok := realVal.Elem().Field(0).Interface().(time.Time); ok {
+                    lowerDefault := strings.ToLower(defaultVar)
+                    if strings.Contains(lowerDefault, "current_timestamp") {
+                        ret[i] = now
+                    } else if lowerDefault == "" {
+                        if name != deletedAtColumn {
+                            ret[i] = now
+                        }
+                    } else if lowerDefault != "null" {
+                        ret[i] = defaultVar
+                    }
                 }
             }
         }