← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/catalog.h

  • Committer: Brian Aker
  • Date: 2011-01-12 06:45:23 UTC
  • mto: (2073.1.4 catalogs)
  • mto: This revision was merged to the branch mainline in revision 2080.
  • Revision ID: brian@tangent.org-20110112064523-rqhptaqbph22qmj1
Remove custom error.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/catalog.h
22
22
#define DRIZZLED_IDENTIFIER_CATALOG_H
23
23
 
24
24
#include <drizzled/enum.h>
25
 
#include <drizzled/definitions.h>
 
25
#include "drizzled/definitions.h"
26
26
#include <string.h>
27
27
 
28
28
#include <assert.h>
37
37
 
38
38
namespace drizzled {
39
39
 
40
 
class lex_string_t;
41
 
 
42
40
namespace identifier {
43
41
 
44
42
class Catalog : public Identifier
46
44
  std::string _name;
47
45
  std::string path;
48
46
 
49
 
  void init();
50
47
 
51
48
public:
52
49
  typedef std::vector<Catalog> vector;
54
51
  typedef Catalog& reference;
55
52
 
56
53
  Catalog(const std::string &name_arg);
57
 
  Catalog(const drizzled::lex_string_t &name_arg);
58
54
 
59
55
  virtual ~Catalog()
60
56
  { }
71
67
    return _name;
72
68
  }
73
69
 
74
 
  virtual void getSQLPath(std::string &sql_path) const;
75
 
 
76
70
  bool isValid() const;
77
71
  bool compare(const std::string &arg) const;
78
72