← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/information_schema_dictionary/table_constraints.cc

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/information_schema_dictionary/table_constraints.cc
34
34
  add_field("TABLE_SCHEMA");
35
35
  add_field("TABLE_NAME");
36
36
  add_field("CONSTRAINT_TYPE");
37
 
  add_field("IS_DEFERRABLE", plugin::TableFunction::BOOLEAN, 0, true);
38
 
  add_field("INITIALLY_DEFERRED", plugin::TableFunction::BOOLEAN, 0, true);
 
37
  add_field("IS_DEFERRABLE", plugin::TableFunction::BOOLEAN, 0, false);
 
38
  add_field("INITIALLY_DEFERRED", plugin::TableFunction::BOOLEAN, 0, false);
39
39
}
40
40
 
41
41
TableConstraints::Generator::Generator(drizzled::Field **arg) :
83
83
 
84
84
        /* CONSTRAINT_TYPE */
85
85
        if (index.is_primary())
 
86
        {
86
87
          push("PRIMARY KEY");
 
88
        }
87
89
        else if (index.is_unique())
 
90
        {
88
91
          push("UNIQUE");
 
92
        }
89
93
        else
 
94
        {
90
95
          assert(0);
91
 
 
 
96
          push("UNIQUE");
 
97
        }
92
98
 
93
99
        /* IS_DEFERRABLE */
94
100
        push(false);