← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to client/drizzledump_drizzle.cc

  • Committer: Brian Aker
  • Date: 2010-10-28 01:45:34 UTC
  • mfrom: (1878.5.8 catalogs)
  • Revision ID: brian@tangent.org-20101028014534-b6qp4wp6crj60h7k
Merge in catalog tree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/drizzledump_drizzle.cc
171
171
  if (verbose)
172
172
    std::cerr << _("-- Retrieving fields for ") << tableName << "..." << std::endl;
173
173
 
174
 
  query= "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_DEFAULT, COLUMN_DEFAULT_IS_NULL, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME, IS_AUTO_INCREMENT, ENUM_VALUES, COLUMN_COMMENT FROM DATA_DICTIONARY.COLUMNS WHERE TABLE_SCHEMA='";
 
174
  query= "SELECT COLUMN_NAME, DATA_TYPE, COLUMN_DEFAULT, COLUMN_DEFAULT_IS_NULL, IS_NULLABLE, CHARACTER_MAXIMUM_LENGTH, NUMERIC_PRECISION, NUMERIC_SCALE, COLLATION_NAME, IS_AUTO_INCREMENT, ENUM_VALUES FROM DATA_DICTIONARY.COLUMNS WHERE TABLE_SCHEMA='";
175
175
  query.append(database->databaseName);
176
176
  query.append("' AND TABLE_NAME='");
177
177
  query.append(tableName);
195
195
    else
196
196
      field->defaultValue= "";
197
197
 
198
 
    field->isNull= (boost::lexical_cast<uint32_t>(row[4])) ? true : false;
199
 
    field->isAutoIncrement= (boost::lexical_cast<uint32_t>(row[9])) ? true : false;
200
 
    field->defaultIsNull= (boost::lexical_cast<uint32_t>(row[3])) ? true : false;
 
198
    field->isNull= (strcmp(row[4], "YES") == 0) ? true : false;
 
199
    field->isAutoIncrement= (strcmp(row[9], "YES") == 0) ? true : false;
 
200
    field->defaultIsNull= (strcmp(row[3], "YES") == 0) ? true : false;
201
201
    field->enumValues= (row[10]) ? row[10] : "";
202
202
    field->length= (row[5]) ? boost::lexical_cast<uint32_t>(row[5]) : 0;
203
203
    field->decimalPrecision= (row[6]) ? boost::lexical_cast<uint32_t>(row[6]) : 0;
204
204
    field->decimalScale= (row[7]) ? boost::lexical_cast<uint32_t>(row[7]) : 0;
205
 
    field->comment= (row[11]) ? row[11] : "";
 
205
 
206
206
 
207
207
    fields.push_back(field);
208
208
  }
244
244
        indexes.push_back(index);
245
245
      index = new DrizzleDumpIndexDrizzle(indexName, dcon);
246
246
      index->isPrimary= (strcmp(row[0], "PRIMARY") == 0);
247
 
      index->isUnique= boost::lexical_cast<uint32_t>(row[3]);
 
247
      index->isUnique= (strcmp(row[3], "YES") == 0);
248
248
      index->isHash= 0;
249
249
      index->length= (row[4]) ? boost::lexical_cast<uint32_t>(row[4]) : 0;
250
250
      lastKey= row[0];
351
351
  result= dcon->query(query);
352
352
 
353
353
  if (result == NULL)
354
 
    throw std::exception();
 
354
    throw 1;
355
355
}
356
356
 
357
357
DrizzleDumpDataDrizzle::~DrizzleDumpDataDrizzle()