Not more equal/unequal sign, "in" and "not in" are now used exclusive…

…ly in queries.
bmc-toolbox · Jan 11, 2021 · f9cd922 · f9cd922
1 parent c4c1139
commit f9cd922
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/filter/example_test.go b/filter/example_test.go
@@ -65,9 +65,9 @@ func ExampleFilters() {
 	// Output:
 	// `MOCK_FAKE_DRIVER` is not officially supported, running under compatibility mode.
 	// true
-	// &{SELECT * FROM ""  WHERE ("bmc_type" = ?) [iLO4]}
+	// &{SELECT * FROM ""  WHERE ("bmc_type" in (?)) [iLO4]}
 	// true
-	// &{SELECT * FROM ""  WHERE ("bmc_type" != ?) [iLO4]}
+	// &{SELECT * FROM ""  WHERE ("bmc_type" not in (?)) [iLO4]}
 	// &{SELECT * FROM ""   []}
 	// false
 }

diff --git a/filter/filter_test.go b/filter/filter_test.go
@@ -17,15 +17,15 @@ var testSet = []struct {
 	urlString string
 	sqlQuery  string
 }{
-	{"filter[model]=dell", "&{SELECT * FROM \"\"  WHERE (\"model\" = ?) [dell]}"},
-	{"filter[status]!=bad", "&{SELECT * FROM \"\"  WHERE (\"status\" != ?) [bad]}"},
-	{"filter[model][eq]=dell", "&{SELECT * FROM \"\"  WHERE (\"model\" = ?) [dell]}"},
-	{"filter[status][ne]=bad", "&{SELECT * FROM \"\"  WHERE (\"status\" != ?) [bad]}"},
+	{"filter[model]=dell", "&{SELECT * FROM \"\"  WHERE (\"model\" in (?)) [dell]}"},
+	{"filter[status]!=bad", "&{SELECT * FROM \"\"  WHERE (\"status\" not in (?)) [bad]}"},
+	{"filter[model][eq]=dell", "&{SELECT * FROM \"\"  WHERE (\"model\" in (?)) [dell]}"},
+	{"filter[status][ne]=bad", "&{SELECT * FROM \"\"  WHERE (\"status\" not in (?)) [bad]}"},
 	{"filter[temp_c][le]=3", "&{SELECT * FROM \"\"  WHERE (\"temp_c\" <= ?) [3]}"},
 	{"filter[temp_c][lt]=3", "&{SELECT * FROM \"\"  WHERE (\"temp_c\" < ?) [3]}"},
 	{"filter[temp_c][ge]=3", "&{SELECT * FROM \"\"  WHERE (\"temp_c\" >= ?) [3]}"},
 	{"filter[temp_c][gt]=3", "&{SELECT * FROM \"\"  WHERE (\"temp_c\" > ?) [3]}"},
-	{"filter[temp_c][gt]=3&filter[vendor]=Dell", "&{SELECT * FROM \"\"  WHERE (\"temp_c\" > ?) AND (\"vendor\" = ?) [3 Dell]}"},
+	{"filter[temp_c][gt]=3&filter[vendor]=Dell", "&{SELECT * FROM \"\"  WHERE (\"temp_c\" > ?) AND (\"vendor\" in (?)) [3 Dell]}"},
 }
 
 func setupDB() *gorm.DB {

diff --git a/storage/storage_chassis.go b/storage/storage_chassis.go
@@ -102,7 +102,7 @@ func (c ChassisStorage) GetAllByPsusID(offset string, limit string, serials []st
 
 // GetOne Chassis
 func (c ChassisStorage) GetOne(serial string) (chassis model.Chassis, err error) {
-	if err = c.db.Where("serial = ?", serial).Preload("Blades").Preload("Blades.Nics").Preload("StorageBlades").Preload("Nics").Preload("Psus").First(&chassis).Error; err != nil {
+	if err = c.db.Where("serial in (?)", serial).Preload("Blades").Preload("Blades.Nics").Preload("StorageBlades").Preload("Nics").Preload("Psus").First(&chassis).Error; err != nil {
 		return chassis, err
 	}
 	return chassis, err