← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/identifier/schema.cc

  • Committer: Lee Bieber
  • Date: 2011-03-23 01:55:35 UTC
  • mfrom: (2245.1.2 build)
  • Revision ID: kalebral@gmail.com-20110323015535-2aatqy8tyiuqtc2z
Merge Olaf - more code refactoring

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/identifier/schema.cc
25
25
#include <drizzled/identifier.h>
26
26
#include <drizzled/session.h>
27
27
#include <drizzled/internal/my_sys.h>
28
 
 
 
28
#include <drizzled/catalog/local.h>
29
29
#include <drizzled/util/tablename_to_filename.h>
30
30
#include <drizzled/util/backtrace.h>
31
31
 
37
37
 
38
38
using namespace std;
39
39
 
40
 
namespace drizzled
41
 
{
42
 
 
43
 
namespace identifier
44
 
{
 
40
namespace drizzled {
 
41
namespace identifier {
45
42
 
46
43
extern string drizzle_tmpdir;
47
44
 
63
60
}
64
61
 
65
62
Schema::Schema(const std::string &db_arg) :
66
 
  db(db_arg),
67
 
  db_path("")
 
63
  db(db_arg)
68
64
{ 
69
65
#if 0
70
66
  string::size_type lastPos= db.find_first_of('/', 0);
164
160
 
165
161
std::ostream& operator<<(std::ostream& output, const Schema&identifier)
166
162
{
167
 
  output << "identifier::Schema:(";
168
 
  output <<  catalog::local_identifier();
169
 
  output << ", ";
170
 
  output <<  identifier.getSchemaName().c_str();
171
 
  output << ", ";
172
 
  output << identifier.getPath().c_str();
173
 
  output << ")";
174
 
 
175
 
  return output;  // for multiple << operators.
 
163
  return output << "identifier::Schema:(" <<  catalog::local_identifier() << ", " <<  identifier.getSchemaName() << ", " << identifier.getPath() << ")";
176
164
}
177
165
 
178
166
} /* namespace identifier */