Skip to content

Commit 42dce6b

Browse files
committed
add more info and will need to look at this query changes and what that would need
1 parent b0c22ad commit 42dce6b

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

dump.go

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -305,19 +305,34 @@ func (table *table) Init() (err error) {
305305
return errors.New("can't init twice")
306306
}
307307

308-
table.rows, err = table.data.tx.Query("SELECT * FROM " + table.NameEsc())
308+
var columns []string
309+
310+
colInfo, err := table.data.tx.Query("SHOW FIELDS FROM " + table.NameEsc())
309311
if err != nil {
310312
return err
311313
}
312314

313-
columns, err := table.rows.Columns()
314-
if err != nil {
315-
return err
315+
for colInfo.Next() {
316+
var field, t, null, key, def, extra string
317+
colInfo.Scan(&field, &t, &null, &key, &def, &extra)
318+
if field == "cert_blob_lookup_hash" {
319+
fmt.Println("this is a thing")
320+
}
321+
322+
columns = append(columns, field)
316323
}
324+
317325
if len(columns) == 0 {
318326
return errors.New("No columns in table " + table.Name + ".")
319327
}
320328

329+
// Total query plus sanitization
330+
331+
table.rows, err = table.data.tx.Query("SELECT * FROM " + table.NameEsc())
332+
if err != nil {
333+
return err
334+
}
335+
321336
tt, err := table.rows.ColumnTypes()
322337
if err != nil {
323338
return err
@@ -329,11 +344,6 @@ func (table *table) Init() (err error) {
329344
st := tp.ScanType()
330345
dt := tp.DatabaseTypeName()
331346

332-
// SHOW FIELDS FROM jamfsoftware.computer_installed_certificates;
333-
// if tp.Name() == "cert_blob_lookup_hash" {
334-
// fmt.Println("why though =", st, ":", dt)
335-
// }
336-
337347
if dt == "BLOB" || dt == "BINARY" {
338348
t = reflect.TypeOf(sql.RawBytes{})
339349
} else if dt == "VARCHAR" || dt == "TEXT" || dt == "DECIMAL" {

0 commit comments

Comments
 (0)