← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_data.cc

  • Committer: Monty Taylor
  • Date: 2011-03-08 23:35:47 UTC
  • mfrom: (2224.2.9 statement2)
  • mto: This revision was merged to the branch mainline in revision 2227.
  • Revision ID: mordred@inaugust.com-20110308233547-w2s3tm5svzv339dp
Merged Olaf - Statement refactor.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_data.cc
56
56
 
57
57
extern int opt_destination;
58
58
 
59
 
/* returns true on keep, false on ignore */
 
59
// returns true on keep, false on ignore Olaf: sounds backwards/wrong, shouldn't it be the other way around?
60
60
bool DrizzleDumpDatabase::ignoreTable(std::string tableName)
61
61
{
62
 
  std::string dbTable(databaseName);
63
 
  dbTable.append(".");
64
 
  dbTable.append(tableName);
65
 
 
66
 
  boost::unordered_set<std::string>::iterator iter= ignore_table.find(dbTable);
67
 
  return (iter == ignore_table.end());
 
62
  return ignore_table.find(databaseName + "." + tableName) == ignore_table.end();
68
63
}
69
64
 
70
65
void DrizzleDumpDatabase::cleanTableName(std::string &tableName)
373
368
          {
374
369
            os << "NULL";
375
370
          }
 
371
          else if (obj.table->fields[i]->type.compare("BOOLEAN") == 0)
 
372
          {
 
373
            if (strncmp(row[i], "1", 1) == 0)
 
374
              os << "TRUE";
 
375
            else
 
376
              os << "FALSE";
 
377
          }
376
378
          else
377
379
            os << "'" << DrizzleDumpData::escape(row[i], row_sizes[i]) << "'";
378
380
          byte_counter+= 3;
561
563
    throw std::exception();
562
564
  }
563
565
 
564
 
  boost::match_flag_type flags = boost::match_default; 
565
 
 
566
 
  boost::regex mysql_regex("(5\\.[0-9]+\\.[0-9]+)");
567
 
  boost::regex drizzle_regex("(20[0-9]{2}\\.(0[1-9]|1[012])\\.[0-9]+)");
568
 
 
569
 
  std::string version(getServerVersion());
570
 
 
571
 
  if (regex_search(version, mysql_regex, flags))
572
 
    serverType= SERVER_MYSQL_FOUND;
573
 
  else if (regex_search(version, drizzle_regex, flags))
574
 
    serverType= SERVER_DRIZZLE_FOUND;
575
 
  else
576
 
    serverType= SERVER_UNKNOWN_FOUND;
 
566
  ServerDetect server_detect= ServerDetect(&connection);
 
567
 
 
568
  serverType= server_detect.getServerType();
 
569
  serverVersion= server_detect.getServerVersion();
577
570
}
578
571
 
579
572
drizzle_result_st* DrizzleDumpConnection::query(std::string &str_query)