← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_mysql.cc

  • Committer: Andrew Hutchings
  • Date: 2010-11-01 22:04:06 UTC
  • mfrom: (1897 merge)
  • mto: This revision was merged to the branch mainline in revision 1907.
  • Revision ID: andrew@linuxjedi.co.uk-20101101220406-nj6i29uzja17u1hn
Merge trunk into branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_mysql.cc
68
68
    else
69
69
      table->autoIncrement= 0;
70
70
 
71
 
    if (row[4])
 
71
    if ((row[4]) and (strstr(row[4], "InnoDB free") == NULL))
72
72
      table->comment= DrizzleDumpData::escape(row[4], row_sizes[4]);
73
73
    else
74
74
      table->comment= "";
186
186
    field->convertDateTime= false;
187
187
    /* Also sets collation */
188
188
    field->setType(row[1], row[8]);
189
 
    field->isNull= (strcmp(row[3], "YES") == 0) ? true : false;
 
189
    if (field->type.compare("ENUM") == 0)
 
190
      field->isNull= true;
 
191
    else
 
192
      field->isNull= (strcmp(row[3], "YES") == 0) ? true : false;
190
193
    if (row[2])
191
194
    {
192
195
      field->defaultValue= row[2];
203
206
    field->isAutoIncrement= (strcmp(row[8], "auto_increment") == 0) ? true : false;
204
207
    field->defaultIsNull= field->isNull;
205
208
    field->length= (row[4]) ? boost::lexical_cast<uint32_t>(row[4]) : 0;
206
 
    field->decimalPrecision= (row[5]) ? boost::lexical_cast<uint32_t>(row[5]) : 0;
207
 
    field->decimalScale= (row[6]) ? boost::lexical_cast<uint32_t>(row[6]) : 0;
208
 
 
 
209
    if ((row[5] != NULL) and (row[6] != NULL))
 
210
    {
 
211
      field->decimalPrecision= boost::lexical_cast<uint32_t>(row[5]);
 
212
      field->decimalScale= boost::lexical_cast<uint32_t>(row[6]);
 
213
    }
 
214
    else
 
215
    {
 
216
      field->decimalPrecision= 0;
 
217
      field->decimalScale= 0;
 
218
    }
209
219
 
210
220
    fields.push_back(field);
211
221
  }
299
309
  if (verbose)
300
310
    std::cerr << _("-- Retrieving foreign keys for ") << tableName << "..." << std::endl;
301
311
 
302
 
  query= "select rc.constraint_name, rc.referenced_table_name, group_concat(distinct concat('`',kc.column_name,'`')), rc.update_rule, rc.delete_rule, rc.match_option, group_concat(distinct concat('`',kt.column_name,'`')) from information_schema.referential_constraints rc join information_schema.key_column_usage kt on (rc.constraint_schema = kt.constraint_schema and rc.constraint_name = kt.constraint_name) join information_schema.key_column_usage kc on (rc.constraint_schema = kc.constraint_schema and rc.referenced_table_name = kc.table_name and rc.unique_constraint_name = kc.constraint_name) where rc.constraint_schema='";
303
 
  query.append(database->databaseName);
304
 
  query.append("' and rc.table_name='");
305
 
  query.append(tableName);
306
 
  query.append("' group by rc.constraint_name");
 
312
  query= "SHOW TABLES FROM INFORMATION_SCHEMA LIKE 'REFERENTIAL_CONSTRAINTS'";
307
313
 
308
314
  result= dcon->query(query);
309
315
 
310
316
  if (result == NULL)
311
317
    return false;
312
318
 
313
 
  while ((row= drizzle_row_next(result)))
314
 
  {
315
 
    fkey= new DrizzleDumpForeignKey(row[0], dcon);
316
 
    fkey->parentColumns= row[6];
317
 
    fkey->childTable= row[1];
318
 
    fkey->childColumns= row[2];
319
 
    fkey->updateRule= (strcmp(row[3], "RESTRICT") != 0) ? row[3] : "";
320
 
    fkey->deleteRule= (strcmp(row[4], "RESTRICT") != 0) ? row[4] : "";
321
 
    fkey->matchOption= (strcmp(row[5], "NONE") != 0) ? row[5] : "";
322
 
 
323
 
    fkeys.push_back(fkey);
 
319
  uint64_t search_count = drizzle_result_row_count(result);
 
320
 
 
321
  dcon->freeResult(result);
 
322
 
 
323
  /* MySQL 5.0 will be 0 and MySQL 5.1 will be 1 */
 
324
  if (search_count > 0)
 
325
  {
 
326
    query= "select rc.constraint_name, rc.referenced_table_name, group_concat(distinct concat('`',kc.column_name,'`')), rc.update_rule, rc.delete_rule, rc.match_option, group_concat(distinct concat('`',kt.column_name,'`')) from information_schema.referential_constraints rc join information_schema.key_column_usage kt on (rc.constraint_schema = kt.constraint_schema and rc.constraint_name = kt.constraint_name) join information_schema.key_column_usage kc on (rc.constraint_schema = kc.constraint_schema and rc.referenced_table_name = kc.table_name and rc.unique_constraint_name = kc.constraint_name) where rc.constraint_schema='";
 
327
    query.append(database->databaseName);
 
328
    query.append("' and rc.table_name='");
 
329
    query.append(tableName);
 
330
    query.append("' group by rc.constraint_name");
 
331
 
 
332
    result= dcon->query(query);
 
333
 
 
334
    if (result == NULL)
 
335
      return false;
 
336
 
 
337
    while ((row= drizzle_row_next(result)))
 
338
    {
 
339
      fkey= new DrizzleDumpForeignKey(row[0], dcon);
 
340
      fkey->parentColumns= row[6];
 
341
      fkey->childTable= row[1];
 
342
      fkey->childColumns= row[2];
 
343
      fkey->updateRule= (strcmp(row[3], "RESTRICT") != 0) ? row[3] : "";
 
344
      fkey->deleteRule= (strcmp(row[4], "RESTRICT") != 0) ? row[4] : "";
 
345
      fkey->matchOption= (strcmp(row[5], "NONE") != 0) ? row[5] : "";
 
346
 
 
347
      fkeys.push_back(fkey);
 
348
    }
 
349
  }
 
350
  else
 
351
  {
 
352
    query= "SHOW CREATE TABLE `";
 
353
    query.append(database->databaseName);
 
354
    query.append("`.`");
 
355
    query.append(tableName);
 
356
    query.append("`");
 
357
    result= dcon->query(query);
 
358
 
 
359
    if (result == NULL)
 
360
      return false;
 
361
 
 
362
    if ((row= drizzle_row_next(result)))
 
363
    {
 
364
      boost::match_flag_type flags = boost::match_default;
 
365
      boost::regex constraint_regex("CONSTRAINT `(.*)` FOREIGN KEY \\((.*)\\) REFERENCES `(.*)` \\((.*)\\)( ON (UPDATE|DELETE) (CASCADE|RESTRICT|SET NULL))?( ON (UPDATE|DELETE) (CASCADE|RESTRICT|SET NULL))?");
 
366
 
 
367
      boost::match_results<std::string::const_iterator> constraint_results;
 
368
 
 
369
      std::string search_body(row[1]);
 
370
      std::string::const_iterator start, end;
 
371
      start= search_body.begin();
 
372
      end= search_body.end();
 
373
      while (regex_search(start, end, constraint_results, constraint_regex, flags))
 
374
      {
 
375
        fkey= new DrizzleDumpForeignKey(constraint_results[1], dcon);
 
376
        fkey->parentColumns= constraint_results[2];
 
377
        fkey->childTable= constraint_results[3];
 
378
        fkey->childColumns= constraint_results[4];
 
379
        
 
380
        if (constraint_results[5].compare("") != 0)
 
381
        {
 
382
          if (constraint_results[6].compare("UPDATE") == 0)
 
383
            fkey->updateRule= constraint_results[7];
 
384
          else if (constraint_results[6].compare("DELETE") == 0)
 
385
            fkey->deleteRule= constraint_results[7];
 
386
        }
 
387
        if (constraint_results[8].compare("") != 0)
 
388
        {
 
389
          if (constraint_results[9].compare("UPDATE") == 0)
 
390
            fkey->updateRule= constraint_results[10];
 
391
          else if (constraint_results[9].compare("DELETE") == 0)
 
392
            fkey->deleteRule= constraint_results[10];
 
393
        }
 
394
        fkey->matchOption= "";
 
395
 
 
396
        fkeys.push_back(fkey);
 
397
 
 
398
        start= constraint_results[0].second;
 
399
        flags |= boost::match_prev_avail; 
 
400
        flags |= boost::match_not_bob;
 
401
      }
 
402
    }
324
403
  }
325
404
  dcon->freeResult(result);
326
405
  return true;
499
578
DrizzleDumpDataMySQL::~DrizzleDumpDataMySQL()
500
579
{
501
580
  drizzle_result_free(result);
502
 
  if (result) delete result;
 
581
  delete result;
503
582
}
504
583
 
505
584
long DrizzleDumpDataMySQL::convertTime(const char* oldTime) const