Skip to content

Commit

Permalink
Switch to upper cases in table/columns due to case-sensitive approach…
Browse files Browse the repository at this point in the history
… in MySQL
  • Loading branch information
vkuznet committed Jan 4, 2024
1 parent 839e454 commit 5d3fe14
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions web/filesdb.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func InsertFiles(did, dataset, path string) error {
log.Printf("InsertFiles: dataset=%s did=%s", dataset, did)

// check if we have already our dataset in DB
dstmt := "SELECT did FROM metadata M JOIN datasets D ON M.meta_id=D.meta_id WHERE D.dataset=? AND M.did=?"
dstmt := "SELECT DID FROM METADATA M JOIN DATASETS D ON M.META_ID=D.META_ID WHERE D.DATASET=? AND M.DID=?"
DID, e := findDID(dstmt, dataset, did)
if e == nil && DID == did {
return nil
Expand All @@ -171,15 +171,15 @@ func InsertFiles(did, dataset, path string) error {
modify_by := "MetaData server"

// insert main attributes
stmt = "INSERT INTO metadata (did,create_at,create_by,modify_at,modify_by) VALUES (?,?,?,?,?)"
stmt = "INSERT INTO METADATA (DID,CREATE_AT,CREATE_BY,MODIFY_AT,MODIFY_BY) VALUES (?,?,?,?,?)"
_, err = tx.Exec(stmt, did, create_at, create_by, modify_at, modify_by)
if err != nil && !strings.Contains(err.Error(), "UNIQUE") {
log.Printf("ERROR: unable to execute %s with %v, error=%v", stmt, did, err)
return tx.Rollback()
}
log.Println("### inserted into metadata")
log.Println("### inserted into METADATA")

stmt = "SELECT meta_id FROM metadata WHERE did=?"
stmt = "SELECT META_ID FROM METADATA WHERE DID=?"
res, err = execute(tx, stmt, did)
if err != nil {
log.Printf("ERROR: unable to execute %s with %v, error=%v", stmt, did, err)
Expand All @@ -189,15 +189,15 @@ func InsertFiles(did, dataset, path string) error {
metaId := rec["meta_id"].(int64)

// insert main attributes
stmt = "INSERT INTO datasets (dataset,meta_id,create_at,create_by,modify_at,modify_by) VALUES (?,?,?,?,?,?)"
stmt = "INSERT INTO DATASETS (DATASET,META_ID,CREATE_AT,CREATE_BY,MODIFY_AT,MODIFY_BY) VALUES (?,?,?,?,?,?)"
_, err = tx.Exec(stmt, dataset, metaId, create_at, create_by, modify_at, modify_by)
if err != nil && !strings.Contains(err.Error(), "UNIQUE") {
log.Printf("ERROR: unable to execute %s with %v, error=%v", stmt, dataset, err)
return tx.Rollback()
}

// select main attributes ids
stmt = "SELECT dataset_id FROM datasets WHERE dataset=?"
stmt = "SELECT DATASET_ID FROM DATASETS WHERE DATASET=?"
res, err = execute(tx, stmt, dataset)
if err != nil {
log.Printf("ERROR: unable to execute %s with %v, error=%v", stmt, dataset, err)
Expand All @@ -208,7 +208,7 @@ func InsertFiles(did, dataset, path string) error {

// insert files info
for _, fname := range files {
stmt = "INSERT INTO files (file,meta_id,dataset_id,create_at,create_by,modify_at,modify_by) VALUES (?,?,?,?,?,?,?)"
stmt = "INSERT INTO FILES (FILE,META_ID,DATASET_ID,CREATE_AT,CREATE_BY,MODIFY_AT,MODIFY_BY) VALUES (?,?,?,?,?,?,?)"
_, err = tx.Exec(stmt, fname, metaId, datasetId, create_at, create_by, modify_at, modify_by)
if err != nil && !strings.Contains(err.Error(), "UNIQUE") {
log.Printf("ERROR: unable to execute %s with did=%v name=%s error=%v", stmt, did, fname, err)
Expand Down Expand Up @@ -236,7 +236,7 @@ func getFiles(did string) ([]string, error) {
defer tx.Rollback()
// look-up files info
// stmt := "SELECT name FROM files WHERE meta_id=?"
stmt := "SELECT F.file FROM files F JOIN metadata M ON M.meta_id=F.meta_id WHERE M.did=?"
stmt := "SELECT F.FILE FROM FILES F JOIN METADATA M ON M.META_ID=F.META_ID WHERE M.DID=?"
res, err := tx.Query(stmt, did)
if err != nil {
log.Printf("ERROR: unable to execute %s, error=%v", stmt, err)
Expand Down Expand Up @@ -293,7 +293,7 @@ func getDatasets() ([]string, error) {
}
defer tx.Rollback()
// dataset is a /cycle/beamline/BTR/sample
stmt := "SELECT D.dataset FROM DATASETS D"
stmt := "SELECT D.DATASET FROM DATASETS D"
res, err := tx.Query(stmt)
if err != nil {
log.Printf("ERROR: unable to execute %s, error=%v", stmt, err)
Expand Down

0 comments on commit 5d3fe14

Please sign in to comment.