Database.rb in dev-1.0.180

- old
+ new

@@ -34,14 +34,19 @@
 	[:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
 	  columns="#{columns}," if columns.length > 0
 	  columns="#{columns}#{s.to_s} text"
 	}
 	@db.execute("create table Results(#{columns});") if ! table_names.include? "Results"
+	@db.close
+	@db=nil
   end
 
   def set_branch_uri(name,uri)
+    @db = SQLite3::Database.new Dev::Database.filename
     @db.execute("insert or replace into Branches (Name,Uri) VALUES ('#{name}','#{uri}');")
+	@db.close
+	@db=nil
   end
 
   def has_result(h)
     results=get_results({:machine=>h[:machine],:user=>h[:user],:start_time=>h[:start_time]})
 	return true if results.length > 0
@@ -59,11 +64,14 @@
 	  values="#{values}," if values.length > 0
 	  columns="#{columns}#{s.to_s}"
 	  values="#{values}'#{sval}'"
 	}
 	#puts "insert or replace into Results (#{columns}) VALUES (#{values});"
+	@db = SQLite3::Database.new Dev::Database.filename
 	@db.execute("insert or replace into Results (#{columns}) VALUES (#{values});")
+	@db.close
+	@db=nil
   end
 
   def get_results(where_hash)
     array=Array.new
     where=""
@@ -78,39 +86,47 @@
 	[:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
 	  columns="#{columns}," if columns.length > 0
 	  columns="#{columns}#{s.to_s}"
 	}
 
-	
+	@db = SQLite3::Database.new Dev::Database.filename
 	@db.execute("select #{columns} from Results where #{where};") do |row|
 	  h=Hash.new
 	  index = 0
 	  [:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
 	    #puts "row[#{index}].to_s=#{row[index].to_s}"
 	    h[s]=row[index].to_s
 	    index=index+1
 	  }
 	  array << h if !h.empty?
 	end
+	@db.close
+	@db=nil
 	  
 	return array
   end
 
   def get_branch_uri(name)
     uri=""
+	@db = SQLite3::Database.new Dev::Database.filename
     @db.execute("select Uri from Branches where Name='#{name}';") do |row|
 	  uri=eval(row[0].to_s)[0]
 	end
+	@db.close
+	@db=nil
 	return uri
   end
 
   def find_branches(pattern)
     names=Array.new
 	sql="select Name from Branches where Name LIKE '#{pattern}';"
 	sql="select Name from Branches;" if pattern.nil? || pattern.length==0
+	@db = SQLite3::Database.new Dev::Database.filename
 	@db.execute(sql) do |row|
 	  names << row[0] if(row[0].length > 0)
 	end
+	@db.close
+	@db=nil
 	return names
   end
 end # class Database
 end # module Dev
\ No newline at end of file