← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/schema.h

  • Committer: Brian Aker
  • Date: 2011-01-01 01:13:51 UTC
  • mto: (2060.4.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2073.
  • Revision ID: brian@tangent.org-20110101011351-07k85on7vvy33cwi
Update so that CATALOG is correctly being displayed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/schema.h
35
35
#include <drizzled/enum.h>
36
36
#include "drizzled/definitions.h"
37
37
#include "drizzled/message/table.pb.h"
 
38
#include "drizzled/catalog/local.h"
38
39
#include <string.h>
39
40
 
40
41
#include <assert.h>
49
50
 
50
51
namespace drizzled {
51
52
 
52
 
static std::string default_catalog("local");
53
 
 
54
53
class SchemaIdentifier
55
54
{
56
55
  std::string db;
57
56
  std::string db_path;
58
 
  std::string catalog;
59
57
 
60
58
public:
61
59
  typedef std::vector <SchemaIdentifier> vector;
76
74
 
77
75
  const std::string &getCatalogName() const
78
76
  {
79
 
    return catalog;
 
77
    return drizzled::catalog::local_identifier().name();
80
78
  }
81
79
 
82
80
  virtual bool isValid() const;
93
91
                                  SchemaIdentifier::const_reference identifier)
94
92
  {
95
93
    output << "SchemaIdentifier:(";
96
 
    output <<  identifier.catalog;
 
94
    output <<  catalog::local_identifier();
97
95
    output << ", ";
98
96
    output <<  identifier.db;
99
97
    output << ", ";