← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_identifier.cc

  • Committer: Brian Aker
  • Date: 2010-03-25 19:25:04 UTC
  • mto: This revision was merged to the branch mainline in revision 1411.
  • Revision ID: brian@gaz-20100325192504-stbk05bhlac8zg3v
Removed the internal table type in favor of the protobuf one.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_identifier.cc
295
295
  {
296
296
    primeLower();
297
297
    switch (type) {
298
 
    case STANDARD_TABLE:
 
298
    case message::Table::STANDARD:
299
299
      build_table_filename(path, lower_db.c_str(), lower_table_name.c_str(), false);
300
300
      break;
301
 
    case INTERNAL_TMP_TABLE:
 
301
    case message::Table::INTERNAL:
302
302
      build_table_filename(path, lower_db.c_str(), lower_table_name.c_str(), true);
303
303
      break;
304
 
    case TEMP_TABLE:
 
304
    case message::Table::TEMPORARY:
305
305
      build_tmptable_filename(path);
306
306
      break;
 
307
    case message::Table::FUNCTION:
 
308
      path.append(db);
 
309
      path.append(".");
 
310
      path.append(table_name);
 
311
      break;
307
312
    }
308
313
    assert(path.length()); // TODO throw exception, this is a possibility
309
314
  }
317
322
  if (sql_path.empty())
318
323
  {
319
324
    switch (type) {
320
 
    case STANDARD_TABLE:
 
325
    case message::Table::FUNCTION:
 
326
    case message::Table::STANDARD:
321
327
      sql_path.append(db);
322
328
      sql_path.append(".");
323
329
      sql_path.append(table_name);
324
330
      break;
325
 
    case INTERNAL_TMP_TABLE:
 
331
    case message::Table::INTERNAL:
326
332
      sql_path.append("temporary.");
327
333
      sql_path.append(table_name);
328
334
      break;
329
 
    case TEMP_TABLE:
 
335
    case message::Table::TEMPORARY:
330
336
      sql_path.append(db);
331
337
      sql_path.append(".#");
332
338
      sql_path.append(table_name);