go/crud_generator
1
0
Fork 0
mirror of https://github.com/ManyakRus/crud_generator.git synced 2024-11-21 05:05:52 +02:00
Code Issues Releases Activity

сделал database.go

Browse Source
This commit is contained in:
Nikitin Aleksandr 2024-10-14 16:13:02 +03:00
parent 73faedefb0
commit 0bcfb9f962
5 changed files with 175 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
internal/database/database.go Normal file
View File

@ -0,0 +1,111 @@
package database
import (
"errors"
"github.com/ManyakRus/crud_generator/internal/create_files"
"github.com/ManyakRus/crud_generator/internal/database/postgres"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/crud_generator/pkg/dbmeta"
"github.com/ManyakRus/starter/log"
"github.com/alexsergivan/transliterator"
)
// FillMapTable - возвращает массив MassTable данными из БД
func FillMapTable(SettingsFill types.SettingsFillFromDatabase) (map[string]*types.Table, error) {
MapTable := make(map[string]*types.Table, 0)
var err error
//заполним MapTable
MapTable, err = postgres.StartAll(SettingsFill)
if err != nil {
log.Error("FillMapTable1() error: ", err)
return MapTable, err
}
//заполним NameGo + TypeGo + NameGo_translit
MapDBTypes := dbmeta.GetMappings()
err = FillNameGoAll(MapTable, MapDBTypes)
//зазполним PrimaryKeys ручные
err = FillPrimaryKeysAll_from_MapPrimaryKeys(MapTable, types.MapPrimaryKeys)
return MapTable, err
}
// FillNameGoAll - заполняет NameGo во всех таблицах, а также NameGo_translit
func FillNameGoAll(MapTable map[string]*types.Table, MapDBTypes map[string]*dbmeta.SQLMapping) error {
var err error
trans := transliterator.NewTransliterator(nil)
for TableName, Table1 := range MapTable {
//заполним имя колонки
ModelName := create_files.Find_SingularName(TableName)
ModelName = create_files.FormatName(ModelName)
NameGo_translit := trans.Transliterate(ModelName, "en")
Table1.NameGo = ModelName
Table1.NameGo_translit = NameGo_translit
for _, Column1 := range Table1.MapColumns {
FillNameGo(Column1)
//postgres.FillTypeGo(MapDBTypes, Column1)
}
}
return err
}
// FillNameGo - заполняет NameGo в 1 колонку
func FillNameGo(Column1 *types.Column) {
var err error
ColumnName := Column1.Name
ColumnNameGo := create_files.FormatName(ColumnName)
Column1.NameGo = ColumnNameGo
if ColumnNameGo == "" {
err = errors.New("FillNameGo() error: Column: " + ColumnName + " Type: " + Column1.Type + " NameGo= \"\"")
log.Panic(err)
}
trans := transliterator.NewTransliterator(nil)
NameGo_translit := trans.Transliterate(ColumnNameGo, "en")
Column1.NameGo_translit = NameGo_translit
return
}
// FillPrimaryKeysAll_from_MapPrimaryKeys - заполняет IsPrimaryKey во всех таблицах
func FillPrimaryKeysAll_from_MapPrimaryKeys(MapTable map[string]*types.Table, MapPrimaryKeys map[string][]string) error {
var err error
for TableName, Table1 := range MapTable {
for _, Column1 := range Table1.MapColumns {
IsPrimaryKey_manual := Find_IsPrimaryKey_manual(MapPrimaryKeys, TableName, Column1.Name)
if IsPrimaryKey_manual == true {
Column1.IsPrimaryKey = true
}
}
}
return err
}
// Find_IsPrimaryKey_manual - возвращает true если эта колонка является PrimaryKey (заполненных вручную)
func Find_IsPrimaryKey_manual(MapPrimaryKeys map[string][]string, TableName string, ColumnName string) bool {
Otvet := false
MassColumnStrings, ok := MapPrimaryKeys[TableName]
if ok == false {
return Otvet
}
for _, ColumnString := range MassColumnStrings {
if ColumnString == ColumnName {
Otvet = true
}
}
return Otvet
}

157
internal/postgres/postgres.go → internal/database/postgres/postgres.go
View File

@ -10,8 +10,6 @@ import (
"github.com/ManyakRus/starter/contextmain"
"github.com/ManyakRus/starter/log"
"github.com/ManyakRus/starter/postgres_gorm"
"github.com/alexsergivan/transliterator"
_ "github.com/alexsergivan/transliterator"
"sort"
"strings"
"time"
@ -36,17 +34,14 @@ type TableRowsStruct struct {
RowsCount sql.NullInt64 `json:"rows_count" gorm:"column:rows_count;default:0"`
}
// FillMapTable - возвращает массив MassTable данными из БД
func FillMapTable(SettingsFill types.SettingsFillFromDatabase) (map[string]*types.Table, error) {
MapTable := make(map[string]*types.Table, 0)
// StartAll - заполняет MapTable данными из БД, и другие колонки
func StartAll(SettingsFill types.SettingsFillFromDatabase) (map[string]*types.Table, error) {
var MapTable map[string]*types.Table
var err error
MapTable, err = FillMapTable1(SettingsFill)
if err != nil {
log.Error("FillMapTable1() error: ", err)
return MapTable, err
}
//заполним ID Minimum
err = FillIDMinimum_ManyPK(MapTable)
//err = FillIDMinimum(MapTable)
if err != nil {
@ -54,6 +49,7 @@ func FillMapTable(SettingsFill types.SettingsFillFromDatabase) (map[string]*type
return MapTable, err
}
//заполним Rows Count
err = FillRowsCount(MapTable)
if err != nil {
log.Error("FillRowsCount() error: ", err)
@ -266,7 +262,7 @@ order by
return MapTable, err
}
trans := transliterator.NewTransliterator(nil)
//trans := transliterator.NewTransliterator(nil)
//заполним MapTable
MapColumns := make(map[string]*types.Column, 0)
@ -290,10 +286,10 @@ order by
//новая таблица
//найдём имя модели golang
TableName := v.TableName
ModelName := create_files.Find_SingularName(TableName)
ModelName = create_files.FormatName(ModelName)
//ModelName := create_files.Find_SingularName(TableName)
//ModelName = create_files.FormatName(ModelName)
NameGo_translit := trans.Transliterate(ModelName, "en")
//NameGo_translit := trans.Transliterate(ModelName, "en")
//
TableComment := v.TableComment
@ -304,8 +300,8 @@ order by
Table1.Name = TableName
Table1.OrderNumber = OrderNumberTable
Table1.Comment = TableComment
Table1.NameGo = ModelName
Table1.NameGo_translit = NameGo_translit
//Table1.NameGo = ModelName
//Table1.NameGo_translit = NameGo_translit
PrimaryKeyColumnsCount = 0
}
@ -313,9 +309,9 @@ order by
Column1 := types.Column{}
Column1.Name = v.ColumnName
Column1.Type = v.ColumnType
FillNameGo(&Column1)
//Type_go
//FillNameGo(&Column1)
//
////Type_go
FillTypeGo(SettingsFill, &Column1)
//SQLMapping1, ok := dbmeta.GetMappings()[Column1.Type]
//if ok == false {
@ -324,8 +320,8 @@ order by
//Type_go := SQLMapping1.GoType
//Column1.TypeGo = Type_go
IsPrimaryKey_manual := Find_IsPrimaryKey_manual(SettingsFill, v.TableName, v.ColumnName)
IsPrimaryKey := v.IsPrimaryKey || IsPrimaryKey_manual
//IsPrimaryKey_manual := database.Find_IsPrimaryKey_manual(SettingsFill, v.TableName, v.ColumnName)
IsPrimaryKey := v.IsPrimaryKey //|| IsPrimaryKey_manual
//
if v.ColumnIsIdentity == "YES" {
Column1.IsIdentity = true
@ -427,6 +423,48 @@ func CreateTable() *types.Table {
// return err
//}
// FindNameType_from_PrimaryKey - возвращает наименование и тип БД для колонки PrimaryKey (ID)
func FindNameType_from_PrimaryKey(Table1 *types.Table) (string, string) {
Otvet := ""
Type := ""
//сортировка по названию колонок
keys := make([]string, 0, len(Table1.MapColumns))
for k := range Table1.MapColumns {
keys = append(keys, k)
}
sort.Strings(keys)
for _, key1 := range keys {
Column1, ok := Table1.MapColumns[key1]
if ok == false {
log.Panic("Table1.MapColumns[key1] = false")
}
if Column1.IsPrimaryKey == true {
return Column1.NameGo, Column1.TypeGo
}
}
return Otvet, Type
}
//// FillTypeGo - заполняет тип golang из типа postgres
//func FillTypeGo(MapTable map[string]*types.Table) {
//
// for _, Table1 := range MapTable {
// for _, Column1 := range Table1.MapColumns {
//
// SQLMapping1, ok := dbmeta.GetMappings()[Column1.Type]
// if ok == false {
// log.Panic("GetMappings() ", Column1.Type, " error: not found")
// }
// Type_go := SQLMapping1.GoType
// Column1.TypeGo = Type_go
// }
// }
//
//}
// FillIDMinimum_ManyPK - находим минимальный ID, для тестов с этим ID, для многих Primary Key
func FillIDMinimum_ManyPK(MapTable map[string]*types.Table) error {
var err error
@ -596,67 +634,6 @@ WHERE
return err
}
// FindNameType_from_PrimaryKey - возвращает наименование и тип БД для колонки PrimaryKey (ID)
func FindNameType_from_PrimaryKey(Table1 *types.Table) (string, string) {
Otvet := ""
Type := ""
//сортировка по названию колонок
keys := make([]string, 0, len(Table1.MapColumns))
for k := range Table1.MapColumns {
keys = append(keys, k)
}
sort.Strings(keys)
for _, key1 := range keys {
Column1, ok := Table1.MapColumns[key1]
if ok == false {
log.Panic("Table1.MapColumns[key1] = false")
}
if Column1.IsPrimaryKey == true {
return Column1.NameGo, Column1.TypeGo
}
}
return Otvet, Type
}
//// FillTypeGo - заполняет тип golang из типа postgres
//func FillTypeGo(MapTable map[string]*types.Table) {
//
// for _, Table1 := range MapTable {
// for _, Column1 := range Table1.MapColumns {
//
// SQLMapping1, ok := dbmeta.GetMappings()[Column1.Type]
// if ok == false {
// log.Panic("GetMappings() ", Column1.Type, " error: not found")
// }
// Type_go := SQLMapping1.GoType
// Column1.TypeGo = Type_go
// }
// }
//
//}
// FillNameGo - заполняет NameGo во все колонки
func FillNameGo(Column1 *types.Column) {
var err error
ColumnName := Column1.Name
ColumnNameGo := create_files.FormatName(ColumnName)
Column1.NameGo = ColumnNameGo
if ColumnNameGo == "" {
err = errors.New("FillNameGo() error: Column: " + ColumnName + " Type: " + Column1.Type + " NameGo= \"\"")
log.Panic(err)
}
trans := transliterator.NewTransliterator(nil)
NameGo_translit := trans.Transliterate(ColumnNameGo, "en")
Column1.NameGo_translit = NameGo_translit
return
}
// FillTypeGo - заполняет тип golang из типа postgres
func FillTypeGo(SettingsFill types.SettingsFillFromDatabase, Column1 *types.Column) {
var err error
@ -681,21 +658,3 @@ func FillTypeGo(SettingsFill types.SettingsFillFromDatabase, Column1 *types.Colu
return
}
// Find_IsPrimaryKey_manual - возвращает true если эта колонка является PrimaryKey (заполненных вручную)
func Find_IsPrimaryKey_manual(SettingsFill types.SettingsFillFromDatabase, TableName string, ColumnName string) bool {
Otvet := false
MassColumnStrings, ok := SettingsFill.MapPrimaryKeys[TableName]
if ok == false {
return Otvet
}
for _, ColumnString := range MassColumnStrings {
if ColumnString == ColumnName {
Otvet = true
}
}
return Otvet
}

3
internal/postgres/postgres_test.go → internal/database/postgres/postgres_test.go
View File

@ -2,6 +2,7 @@ package postgres
import (
"github.com/ManyakRus/crud_generator/internal/config"
"github.com/ManyakRus/crud_generator/internal/database"
"github.com/ManyakRus/starter/postgres_gorm"
"testing"
)
@ -12,7 +13,7 @@ func TestFillMassTable(t *testing.T) {
postgres_gorm.Connect()
defer postgres_gorm.CloseConnection()
Otvet, err := FillMapTable()
Otvet, err := database.FillMapTable()
if err != nil {
t.Error("TestFillMassTable() error: ", err)
}

7
internal/logic/logic.go
View File

@ -25,9 +25,9 @@ import (
"github.com/ManyakRus/crud_generator/internal/create_files/server_grpc_tables"
"github.com/ManyakRus/crud_generator/internal/create_files/server_nrpc_starter"
"github.com/ManyakRus/crud_generator/internal/create_files/tables_tables"
"github.com/ManyakRus/crud_generator/internal/database"
"github.com/ManyakRus/crud_generator/internal/folders"
"github.com/ManyakRus/crud_generator/internal/load_configs"
"github.com/ManyakRus/crud_generator/internal/postgres"
"github.com/ManyakRus/crud_generator/internal/types"
"github.com/ManyakRus/crud_generator/pkg/dbmeta"
"github.com/ManyakRus/starter/log"
@ -41,12 +41,11 @@ func StartFillAll() error {
//заполним MapAll
SettingsFillFromDatabase := types.SettingsFillFromDatabase{}
SettingsFillFromDatabase.MapDBTypes = dbmeta.GetMappings()
SettingsFillFromDatabase.INCLUDE_TABLES = config.Settings.INCLUDE_TABLES
SettingsFillFromDatabase.EXCLUDE_TABLES = config.Settings.EXCLUDE_TABLES
SettingsFillFromDatabase.NEED_USE_DB_VIEWS = config.Settings.NEED_USE_DB_VIEWS
SettingsFillFromDatabase.MapPrimaryKeys = types.MapPrimaryKeys
MapAll, err := postgres.FillMapTable(SettingsFillFromDatabase)
SettingsFillFromDatabase.MapDBTypes = dbmeta.GetMappings()
MapAll, err := database.FillMapTable(SettingsFillFromDatabase)
if err != nil {
log.Error("FillMapTable() error: ", err)
return err

2
internal/types/types.go
View File

@ -89,7 +89,7 @@ type SettingsFillFromDatabase struct {
EXCLUDE_TABLES string
NEED_USE_DB_VIEWS bool
MapDBTypes map[string]*dbmeta.SQLMapping //карта соответсвий типов в базе данных и типов в golang
MapPrimaryKeys map[string][]string
//MapPrimaryKeys map[string][]string
}
// MapPrimaryKeys - карта первичных ключей, добавленных вручную в файл primary_keys.json