dealing with invalid require statements

copiousfreetime · Oct 29, 2008 · 3a5ed73 · 3a5ed73
1 parent 9408452
commit 3a5ed73
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/amalgalite/requires.rb b/lib/amalgalite/requires.rb
@@ -172,9 +172,13 @@ def require( filename )
       else
         begin
           rows = db_connection.execute(sql, filename)
-          row = rows.first
-          eval( row[contents_column].to_s, TOPLEVEL_BINDING)
-          $" << row[filename_column]
+          if rows.size > 0 then
+            row = rows.first
+            eval( row[contents_column].to_s, TOPLEVEL_BINDING)
+            $" << row[filename_column]
+          else
+            raise LoadError, "no row with filename #{filename} exists in #{dbfile_name}"
+          end
         rescue => e
           raise LoadError, "Failure loading #{filename} from #{dbfile_name} : #{e}"
         end