extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-11-22 16:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Add completely broken support for an incrementing id"

Browse Source 
This reverts commit da624cf8aa. This commit was just added for history purposes.
This commit is contained in:
David Dworken 2022-09-04 15:40:30 -07:00
parent da624cf8aa
commit 74ed49dd1a
2 changed files with 2 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/data/data.go
View File

@ -26,7 +26,6 @@ const (
)
type HistoryEntry struct {
Local_Id int `json:"local_id" gorm:"type:int;autoIncrement:true"`
LocalUsername string `json:"local_username" gorm:"uniqueIndex:compositeindex"`
Hostname string `json:"hostname" gorm:"uniqueIndex:compositeindex"`
Command string `json:"command" gorm:"uniqueIndex:compositeindex"`

48
client/lib/lib.go
View File

@ -320,7 +320,7 @@ func AddToDbIfNew(db *gorm.DB, entry data.HistoryEntry) {
var results []data.HistoryEntry
tx.Limit(1).Find(&results)
if len(results) == 0 {
db.Create(&entry)
db.Create(entry)
}
}
@ -859,55 +859,11 @@ func OpenLocalSqliteDb() (*gorm.DB, error) {
if err != nil {
return nil, err
}
err = migrateDbToAddIdColumn(db)
if err != nil {
return nil, err
}
// db.AutoMigrate(&data.HistoryEntry{})
db.AutoMigrate(&data.HistoryEntry{})
db.Exec("PRAGMA journal_mode = WAL")
return db, nil
}
func migrateDbToAddIdColumn(db *gorm.DB) error {
if !db.Migrator().HasTable(&data.HistoryEntry{}) {
return nil
}
if db.Migrator().HasTable("history_entry_tmp") {
err := db.Migrator().RenameTable("history_entry_tmp", &data.HistoryEntry{})
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to rename an existing tmp table: %v", err)
}
}
if db.Migrator().HasColumn(&data.HistoryEntry{}, "local_id") {
return nil
}
err := db.Migrator().DropIndex(&data.HistoryEntry{}, "compositeindex")
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to delete the index: %v", err)
}
err = db.Migrator().RenameTable(&data.HistoryEntry{}, "history_entry_tmp")
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to rename the history table to a tmp table: %v", err)
}
err = db.Migrator().CreateTable(&data.HistoryEntry{})
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to create a new history table: %v", err)
}
rawDb, err := db.DB()
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to retrieve a raw DB pointer: %v", err)
}
_, err = rawDb.Exec("INSERT INTO history_entries SELECT ROW_NUMBER() OVER(ORDER BY CAST(strftime(\"%s\",start_time) AS INTEGER)) as local_id, * FROM history_entry_tmp")
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to insert into a new history table: %v", err)
}
err = db.Migrator().DropTable("history_entry_tmp")
if err != nil {
return fmt.Errorf("DB Migration failed: Failed to delete the tmp table: %v", err)
}
return nil
}
func ApiGet(path string) ([]byte, error) {
start := time.Now()
resp, err := http.Get(getServerHostname() + path)