lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb in knjrbfw-0.0.32 vs lib/knj/knjdb/drivers/mysql/knjdb_mysql_tables.rb in knjrbfw-0.0.33

@@ -1,16 +1,14 @@
-require "#{$knjpath}wref"
-
 class KnjDB_mysql::Tables
   attr_reader :db, :list
   
   def initialize(args)
     @args = args
     @db = @args[:db]
     @subtype = @db.opts[:subtype]
     @list_mutex = Mutex.new
-    @list = Knj::Wref_map.new
+    @list = Wref_map.new
     @list_should_be_reloaded = true
   end
   
   def clean
     @list.clean
@@ -20,11 +18,11 @@
   def [](table_name)
     table_name = table_name.to_s
     
     begin
       return @list[table_name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     
     self.list(:name => table_name) do |table_obj|
       return table_obj if table_obj.name == table_name
@@ -103,12 +101,12 @@
   def initialize(args)
     @args = args
     @db = args[:db]
     @data = args[:data]
     @subtype = @db.opts[:subtype]
-    @list = Knj::Wref_map.new
-    @indexes_list = Knj::Wref_map.new
+    @list = Wref_map.new
+    @indexes_list = Wref_map.new
     
     raise "Could not figure out name from: '#{@data}'." if !@data[:Name]
   end
   
   def reload
@@ -141,11 +139,11 @@
   def column(name)
     name = name.to_s
     
     begin
       return @list[name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     
     self.columns do |col|
       return col if col.name == name
@@ -221,10 +219,10 @@
   def index(name)
     name = name.to_s
     
     begin
       return @indexes_list[name]
-    rescue Knj::Wref::Recycled
+    rescue Wref::Recycled
       #ignore.
     end
     
     self.indexes do |index|
       return index if index.name == name
\ No newline at end of file