← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to libdrizzleclient/drizzle_methods.h

  • Committer: Jay Pipes
  • Date: 2009-03-16 15:20:27 UTC
  • mto: (934.3.7 mordred)
  • mto: This revision was merged to the branch mainline in revision 938.
  • Revision ID: jpipes@serialcoder-20090316152027-njlreaim8vxqta6c
Fixes ENUM field type to throw an error on bad data input.  0 is now not
allowed on insertion.  MySQL allows 0, in the manual it states 0 is "the
null string error index" whatever that means.  Drizzle doesn't allow it.

Corrected test cases.

Also cleans up indentation on JOIN::exec() which was bothering me.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libdrizzleclient/drizzle_methods.h
 
1
/* - mode: c; c-basic-offset: 2; indent-tabs-mode: nil; -*-
 
2
 *  vim:expandtab:shiftwidth=2:tabstop=2:smarttab:
 
3
 *
 
4
 *  Copyright (C) 2008 Sun Microsystems, Inc.
 
5
 *
 
6
 *  This program is free software; you can redistribute it and/or modify
 
7
 *  it under the terms of the GNU General Public License as published by
 
8
 *  the Free Software Foundation; version 2 of the License.
 
9
 *
 
10
 *  This program is distributed in the hope that it will be useful,
 
11
 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
 
12
 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
13
 *  GNU General Public License for more details.
 
14
 *
 
15
 *  You should have received a copy of the GNU General Public License
 
16
 *  along with this program; if not, write to the Free Software
 
17
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
18
 */
 
19
 
 
20
#ifndef LIBDRIZZLECLIENT_DRIZZLE_METHODS_H
 
21
#define LIBDRIZZLECLIENT_DRIZZLE_METHODS_h
 
22
 
 
23
#include "drizzle.h"
 
24
#include "drizzle_data.h"
 
25
#include "drizzle_res.h"
 
26
#include "drizzle_field.h"
 
27
 
 
28
#include <stdint.h>
 
29
#if !defined(__cplusplus)
 
30
# include <stdbool.h>
 
31
#endif
 
32
 
 
33
#ifdef  __cplusplus
 
34
extern "C" {
 
35
#endif
 
36
 
 
37
typedef struct st_drizzle_methods
 
38
{
 
39
  bool (*read_query_result)(DRIZZLE *drizzle);
 
40
  bool (*advanced_command)(DRIZZLE *drizzle,
 
41
                           enum enum_server_command command,
 
42
                           const unsigned char *header,
 
43
                           uint32_t header_length,
 
44
                           const unsigned char *arg,
 
45
                           uint32_t arg_length,
 
46
                           bool skip_check);
 
47
  DRIZZLE_DATA *(*read_rows)(DRIZZLE *drizzle, DRIZZLE_FIELD *drizzle_fields,
 
48
                             uint32_t fields);
 
49
  DRIZZLE_RES * (*use_result)(DRIZZLE *drizzle);
 
50
  void (*fetch_lengths)(uint32_t *to, DRIZZLE_ROW column,
 
51
                        uint32_t field_count);
 
52
  void (*flush_use_result)(DRIZZLE *drizzle);
 
53
  DRIZZLE_FIELD * (*list_fields)(DRIZZLE *drizzle);
 
54
  int32_t (*unbuffered_fetch)(DRIZZLE *drizzle, char **row);
 
55
  const char *(*read_statistics)(DRIZZLE *drizzle);
 
56
  bool (*next_result)(DRIZZLE *drizzle);
 
57
} DRIZZLE_METHODS;
 
58
 
 
59
static inline int32_t simple_command(DRIZZLE *drizzle, enum enum_server_command command, const unsigned char *arg, uint32_t length, bool skip_check)
 
60
{
 
61
  return (*(drizzle)->methods->advanced_command)(drizzle, command, 0,
 
62
                                                 0, arg, length, skip_check);
 
63
}
 
64
 
 
65
#ifdef  __cplusplus
 
66
}
 
67
#endif
 
68
 
 
69
#endif /* LIBDRIZZLECLIENT_DRIZZLE_METHODS_H */