Skip to content

Commit 15c5c8c

Browse files
committed
made code dry
1 parent e166798 commit 15c5c8c

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

mysqlite/my_sqlite_request.rb

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,7 @@ def run
107107

108108

109109
if @isWhere
110-
@where_conditions.each do |current_condition| #all where condtions will run for the current table row before the process_row runs
111-
current_condition.each do |key,value|
112-
if current_row[key] != value
113-
@all_conditions_met=false
114-
break
115-
end
116-
end
117-
end
110+
@all_conditions_met=check_all_conditions_met(current_row,@where_conditions)
118111
process_row(current_row, result_hash, @filtered_hash_array, @columns)if @all_conditions_met
119112
@final=@filtered_hash_array
120113
end #isWhere
@@ -141,17 +134,7 @@ def run
141134
updated_array=[]
142135
header=CSV.read(@table_name,headers:true).headers
143136
CSV.foreach(@table_name,headers:true) do |current_csv_row|
144-
all_conditions_met=true
145-
146-
@where_conditions.each do |current_condition|
147-
current_condition.each do |key,value|
148-
if current_csv_row[key]!=value
149-
all_conditions_met=false
150-
break
151-
end
152-
end
153-
end#where
154-
137+
all_conditions_met=check_all_conditions_met(current_csv_row,@where_conditions)
155138
if all_conditions_met
156139
#then update the row before pushing to the csv
157140
@dataToInsert.each do |current_condition|#[{"name"=>"Alaa Renamed", "college"=>"Renamed University"}]
@@ -242,7 +225,20 @@ def process_row(row,result_hash, selected_hash_array,columns)
242225
selected_hash_array << result_hash if result_hash != {}
243226
244227
end
228+
def check_all_conditions_met(current_row, where_conditions)
229+
all_conditions_met = true
230+
231+
where_conditions.each do |current_condition|
232+
current_condition.each do |key, value|
233+
if current_row[key] != value
234+
all_conditions_met = false
235+
break
236+
end
237+
end
238+
end
245239
240+
all_conditions_met
241+
end
246242
247243
def merge_sort(array, &block)
248244
return array if array.length <= 1
@@ -275,7 +271,11 @@ def merge(left, right, &block)
275271
end
276272
277273
request = MySqliteRequest.new
278-
request = request.update('nba_player_data.csv')
279-
request = request.set('name' => 'Jimmy agabaje')
280-
request = request.where('name', 'Jim Zoet Renamed2')
281-
request.run
274+
request=request.from('nba_players.csv')
275+
request=request.select('player','height')
276+
request=request.where('height','196')
277+
request=request.run()
278+
# request = request.update('nba_player_data.csv')
279+
# request = request.set('name' => 'Jimmy agabaje2')
280+
# request = request.where('name', 'Jimmy agabaje')
281+
# request.run

mysqlite/nba_player_data.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name,year_start,year_end,position,height,weight,birth_date,college
22
Paul Zipser,2017,2018,G-F,6-8,215,"February 18, 1994",
33
Ante Zizic,2018,2018,F-C,6-11,250,"January 4, 1997",
4-
Jimmy agabaje,1983,1983,C,7-1,240,"December 20, 1953",Kent State University
4+
Jimmy agabaje2,1983,1983,C,7-1,240,"December 20, 1953",Kent State University
55
Bill Zopf,1971,1971,G,6-1,170,"June 7, 1948",Duquesne University
66
Ivica Zubac,2017,2018,C,7-1,265,"March 18, 1997",
77
Matt Zunic,1949,1949,G-F,6-3,195,"December 19, 1919",George Washington University

0 commit comments

Comments
 (0)