knjdb_sqlite3_tables.rb in knjrbfw-0.0.8

- old
+ new

@@ -78,11 +78,11 @@
 	def columns
 		if !@list
 			@db.cols
 			@list = {}
 			
-			q_cols = @db.query("PRAGMA table_info(#{self.name})")
+			q_cols = @db.query("PRAGMA table_info(`#{@driver.esc_table(self.name)}`)")
 			while d_cols = q_cols.fetch
 				@list[d_cols[:name]] = KnjDB_sqlite3::Columns::Column.new(
 					:table => self,
 					:db => @db,
 					:driver => @driver,
@@ -94,11 +94,11 @@
 		return @list
 	end
 	
 	def create_columns(col_arr)
 		col_arr.each do |col_data|
-			#if col_data.has_key?("after")
+			#if col_data.key?("after")
 			#	self.create_column_programmatic(col_data)
 			#else
 				@db.query("ALTER TABLE `#{self.name}` ADD COLUMN #{@db.cols.data_sql(col_data)};")
 			#end
 		end
@@ -173,11 +173,11 @@
 			next if args["drops"] and args["drops"].index(name) != nil
 			
 			sql += ", " if !first
 			first = false if first
 			
-			if args.has_key?("alter_columns") and args["alter_columns"][name.to_s]
+			if args.key?("alter_columns") and args["alter_columns"][name.to_s]
 				sql += @db.cols.data_sql(args["alter_columns"][name.to_s])
 			else
 				sql += @db.cols.data_sql(col.data)
 			end
 			
@@ -225,11 +225,11 @@
 	def indexes
 		if !@indexes_list
 			@db.indexes
 			@indexes_list = {}
 			
-			q_indexes = @db.query("PRAGMA index_list(`#{self.name}`)")
+			q_indexes = @db.query("PRAGMA index_list(`#{@driver.esc_table(self.name)}`)")
 			while d_indexes = q_indexes.fetch
         if @db.opts[:index_append_table_name]
           match_name = d_indexes[:name].match(/__(.+)$/)
           
           if match_name
@@ -255,10 +255,10 @@
 		return @indexes_list
 	end
 	
 	def create_indexes(index_arr)
 		index_arr.each do |index_data|
-			raise "No name was given." if !index_data.has_key?("name") or index_data["name"].strip.length <= 0
+			raise "No name was given." if !index_data.key?("name") or index_data["name"].strip.length <= 0
 			raise "No columns was given on index #{index_data["name"]}." if index_data["columns"].empty?
 			
 			name = index_data["name"]
 			name = "#{self.name}__#{name}" if @db.opts[:index_append_table_name]
 			
\ No newline at end of file