go/crud_generator
1
0
Fork 0
mirror of https://github.com/ManyakRus/crud_generator.git synced 2024-11-24 08:22:42 +02:00
Code Issues Releases Activity

сделал PrimaryKeyColumnsCount

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-05-02 17:56:29 +03:00
parent 038878ad31
commit 709d8a9d7b
4 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
internal/create_files/create_files.go
View File

@ -287,7 +287,7 @@ func IsGoodTable(Table1 *types.Table) error {
// err = errors.New(TextError) // err = errors.New(TextError)
//} //}
err = IsGoodTablePrefix(Table1) err = IsGoodTableNamePrefix(Table1)
if err != nil { if err != nil {
return err return err
} }
@ -312,8 +312,8 @@ func IsGoodPrimaryKeyColumnsCount(Table1 *types.Table) error {
return err return err
} }
// IsGoodTablePrefix - возвращает ошибку если префикс таблицы = "DELETED_" // IsGoodTableNamePrefix - возвращает ошибку если префикс таблицы = "DELETED_"
func IsGoodTablePrefix(Table1 *types.Table) error { func IsGoodTableNamePrefix(Table1 *types.Table) error {
var err error var err error
TableName := Table1.Name TableName := Table1.Name
@ -1778,16 +1778,18 @@ func Replace_Postgres_ID_Test(Text string, Table1 *types.Table) string {
Otvet := Text Otvet := Text
TextFind := "const Postgres_ID_Test = 0" TextFind := "const Postgres_ID_Test = 0"
ColumnPrimary := FindPrimaryKeyColumn(Table1) PrimaryKeyColumn := FindPrimaryKeyColumn(Table1)
if ColumnPrimary == nil { if PrimaryKeyColumn == nil {
return Otvet return Otvet
} }
IDMinimum := Table1.IDMinimum IDMinimum := Table1.IDMinimum
if IDMinimum == "" {
IDMinimum = FindTextDefaultValue(PrimaryKeyColumn.TypeGo)
}
if ColumnPrimary.TypeGo == "uuid.UUID" { if PrimaryKeyColumn.TypeGo == "uuid.UUID" {
if Table1.IDMinimum == "" { if Table1.IDMinimum == "" {
IDMinimum = FindTextDefaultValue(ColumnPrimary.TypeGo)
Otvet = strings.ReplaceAll(Otvet, TextFind, `var Postgres_ID_Test = `+IDMinimum+``) Otvet = strings.ReplaceAll(Otvet, TextFind, `var Postgres_ID_Test = `+IDMinimum+``)
} else { } else {
Otvet = strings.ReplaceAll(Otvet, TextFind, `var Postgres_ID_Test, _ = uuid.Parse("`+IDMinimum+`")`) Otvet = strings.ReplaceAll(Otvet, TextFind, `var Postgres_ID_Test, _ = uuid.Parse("`+IDMinimum+`")`)
@ -1812,15 +1814,18 @@ func Replace_Model_ID_Test(Text string, Table1 *types.Table) string {
} }
IDMinimum := Table1.IDMinimum IDMinimum := Table1.IDMinimum
if IDMinimum == "" {
IDMinimum = FindTextDefaultValue(PrimaryKeyColumn.TypeGo)
}
if PrimaryKeyColumn.TypeGo == "uuid.UUID" { if PrimaryKeyColumn.TypeGo == "uuid.UUID" {
if Table1.IDMinimum == "" { if Table1.IDMinimum == "" {
Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test = ""`) Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test = `+IDMinimum+``)
} else { } else {
Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test = "`+IDMinimum+`"`) Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test, _ = uuid.Parse("`+IDMinimum+`")`)
} }
} else { } else {
Otvet = strings.ReplaceAll(Otvet, TextFind, `var `+ModelName+`_ID_Test = `+IDMinimum) Otvet = strings.ReplaceAll(Otvet, TextFind, `const `+ModelName+`_ID_Test = `+IDMinimum)
} }
return Otvet return Otvet

18
internal/create_files/entities_tables/entities_tables.go
View File

@ -19,17 +19,25 @@ func CreateAllFiles(MapAll map[string]*types.Table) error {
var err error var err error
//для каждой таблицы //для каждой таблицы
for _, table1 := range MapAll { for _, Table1 := range MapAll {
err = CreateFiles(table1) //проверка имени таблицы "DELETED_"
err1 := create_files.IsGoodTableNamePrefix(Table1)
if err1 != nil {
log.Warn("CreateFiles() table: ", Table1.Name, " warning: ", err)
continue
}
//создание файлов
err = CreateFiles(Table1)
if err != nil { if err != nil {
log.Error("CreateFiles() table: ", table1.Name, " error: ", err) log.Error("CreateFiles() table: ", Table1.Name, " error: ", err)
return err return err
} }
if config.Settings.NEED_CREATE_UPDATE_EVERY_COLUMN == true { if config.Settings.NEED_CREATE_UPDATE_EVERY_COLUMN == true {
err = CreateFilesUpdateEveryColumn(table1) err = CreateFilesUpdateEveryColumn(Table1)
if err != nil { if err != nil {
log.Error("CreateFiles() table: ", table1.Name, " error: ", err) log.Error("CreateFiles() table: ", Table1.Name, " error: ", err)
return err return err
} }
} }

14
internal/create_files/tables_tables/tables_tables.go
View File

@ -18,10 +18,18 @@ import (
func CreateAllFiles(MapAll map[string]*types.Table) error { func CreateAllFiles(MapAll map[string]*types.Table) error {
var err error var err error
for _, table1 := range MapAll { for _, Table1 := range MapAll {
err = CreateFiles(table1) //проверка имени таблицы "DELETED_"
err1 := create_files.IsGoodTableNamePrefix(Table1)
if err1 != nil {
log.Warn("CreateFiles() table: ", Table1.Name, " warning: ", err)
continue
}
//
err = CreateFiles(Table1)
if err != nil { if err != nil {
log.Error("CreateFiles() table: ", table1.Name, " error: ", err) log.Error("CreateFiles() table: ", Table1.Name, " error: ", err)
return err return err
} }
} }

5
internal/postgres/postgres.go
View File

@ -278,6 +278,7 @@ order by
OrderNumberTable++ OrderNumberTable++
} }
//новая таблица
//найдём имя модели golang //найдём имя модели golang
TableName := v.TableName TableName := v.TableName
ModelName := create_files.FindSingularName(TableName) ModelName := create_files.FindSingularName(TableName)
@ -287,6 +288,7 @@ order by
TableComment := v.TableComment TableComment := v.TableComment
TableComment = strings.ReplaceAll(TableComment, "\n", "") TableComment = strings.ReplaceAll(TableComment, "\n", "")
TableComment = strings.ReplaceAll(TableComment, "\r", "") TableComment = strings.ReplaceAll(TableComment, "\r", "")
Table1 = CreateTable() Table1 = CreateTable()
Table1.Name = TableName Table1.Name = TableName
Table1.OrderNumber = OrderNumberTable Table1.OrderNumber = OrderNumberTable
@ -333,9 +335,10 @@ order by
TableName0 = v.TableName TableName0 = v.TableName
} }
// //последнюю таблицу заполним тут
if Table1.Name != "" { if Table1.Name != "" {
Table1.MapColumns = MapColumns Table1.MapColumns = MapColumns
Table1.PrimaryKeyColumnsCount = PrimaryKeyColumnsCount
MapTable[TableName0] = Table1 MapTable[TableName0] = Table1
} }