← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/schema_dictionary/schemas.cc

  • Committer: Brian Aker
  • Date: 2010-10-10 11:41:42 UTC
  • mfrom: (1812.3.8 refactor)
  • Revision ID: brian@tangent.org-20101010114142-qfvzs75hz6kxjdcg
Merge in shared_ptr usage.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/schema_dictionary/schemas.cc
33
33
  add_field("SCHEMA_UPDATE_TIME");
34
34
  add_field("SCHEMA_UUID", plugin::TableFunction::STRING, 36, true);
35
35
  add_field("SCHEMA_VERSION", plugin::TableFunction::NUMBER, 0, true);
 
36
  add_field("SCHEMA_USE_COUNT", plugin::TableFunction::NUMBER, 0, true);
36
37
}
37
38
 
38
39
SchemasTool::Generator::Generator(Field **arg) :
43
44
  
44
45
bool SchemasTool::Generator::nextSchema()
45
46
{
46
 
  const drizzled::message::Schema *schema_ptr;
 
47
  drizzled::message::SchemaPtr schema_ptr;
47
48
  while ((schema_ptr= schema_generator))
48
49
  {
49
 
    schema.CopyFrom(*schema_ptr);
 
50
    schema= schema_ptr;
50
51
    return true;
51
52
  }
52
53
 
71
72
void SchemasTool::Generator::fill()
72
73
{
73
74
  /* SCHEMA_NAME */
74
 
  push(schema.name());
 
75
  push(schema->name());
75
76
 
76
77
  /* DEFAULT_COLLATION_NAME */
77
 
  push(schema.collation());
 
78
  push(schema->collation());
78
79
 
79
80
  /* SCHEMA_CREATION_TIME */
80
 
  time_t time_arg= schema.creation_timestamp();
 
81
  time_t time_arg= schema->creation_timestamp();
81
82
  char buffer[40];
82
83
  struct tm tm_buffer;
83
84
 
86
87
  push(buffer);
87
88
 
88
89
  /* SCHEMA_UPDATE_TIME */
89
 
  time_arg= schema.update_timestamp();
 
90
  time_arg= schema->update_timestamp();
90
91
  localtime_r(&time_arg, &tm_buffer);
91
92
  strftime(buffer, sizeof(buffer), "%a %b %d %H:%M:%S %Y", &tm_buffer);
92
93
  push(buffer);
93
94
 
94
95
  /* SCHEMA_UUID */
95
 
  push(schema.uuid());
 
96
  push(schema->uuid());
96
97
 
97
98
  /* SCHEMA_VERSION */
98
 
  push(schema.version());
 
99
  push(schema->version());
 
100
 
 
101
  /* SCHEMA_USE_COUNT */
 
102
  push(schema->version());
99
103
}