← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/table_proto_write.cc

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/table_proto_write.cc
13
13
   along with this program; if not, write to the Free Software
14
14
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
15
15
 
16
 
#include <config.h>
 
16
#include "config.h"
17
17
#include <drizzled/error.h>
18
18
#include <drizzled/session.h>
19
19
#include <drizzled/unireg.h>
20
 
#include <drizzled/sql_table.h>
21
 
#include <drizzled/global_charset_info.h>
22
 
#include <drizzled/message/statement_transform.h>
23
 
 
24
 
#include <drizzled/plugin/storage_engine.h>
25
 
 
26
 
#include <drizzled/internal/my_sys.h>
27
 
#include <drizzled/typelib.h>
 
20
#include "drizzled/sql_table.h"
 
21
#include "drizzled/global_charset_info.h"
 
22
#include "drizzled/message/statement_transform.h"
 
23
 
 
24
#include "drizzled/internal/my_sys.h"
 
25
 
28
26
 
29
27
/* For proto */
30
28
#include <string>
39
37
#include <drizzled/table_proto.h>
40
38
#include <drizzled/charset.h>
41
39
 
42
 
#include <drizzled/function/time/typecast.h>
 
40
#include "drizzled/function/time/typecast.h"
43
41
 
44
42
using namespace std;
45
43
 
52
50
                      KeyInfo *key_info)
53
51
{
54
52
  CreateField *field_arg;
55
 
  List<CreateField>::iterator it(create_fields.begin());
 
53
  List_iterator<CreateField> it(create_fields);
56
54
  message::Table::TableOptions *table_options= table_proto.mutable_options();
57
55
 
58
56
  if (create_fields.elements > MAX_FIELDS)
300
298
          return true;
301
299
        }
302
300
 
303
 
        if (field::isDateTime(field_arg->sql_type))
 
301
        if (field_arg->sql_type == DRIZZLE_TYPE_DATE
 
302
            || field_arg->sql_type == DRIZZLE_TYPE_TIME
 
303
            || field_arg->sql_type == DRIZZLE_TYPE_DATETIME
 
304
            || field_arg->sql_type == DRIZZLE_TYPE_MICROTIME
 
305
            || field_arg->sql_type == DRIZZLE_TYPE_TIMESTAMP)
304
306
        {
305
307
          type::Time ltime;
306
308
 
307
 
          if (field_arg->def->get_date(ltime, TIME_FUZZY_DATE))
 
309
          if (field_arg->def->get_date(&ltime, TIME_FUZZY_DATE))
308
310
          {
309
311
            my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR),
310
312
                     default_value->c_str());