← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/pbms/src/ha_pbms.cc

  • 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:
plugin/pbms/src/ha_pbms.cc
32
32
#endif
33
33
 
34
34
#ifdef DRIZZLED
35
 
#include <config.h>
36
 
 
37
 
#include <drizzled/current_session.h>
 
35
#include "config.h"
38
36
#include <drizzled/common.h>
39
37
#include <drizzled/plugin.h>
40
38
#include <drizzled/field.h>
116
114
        int doCommit(Session *, bool);
117
115
        int doRollback(Session *, bool);
118
116
        Cursor *create(Table& table);
119
 
        bool doDropSchema(const drizzled::identifier::Schema&);
 
117
        bool doDropSchema(const drizzled::SchemaIdentifier&);
120
118
        
121
119
        /*
122
120
        * Indicates to a storage engine the start of a
137
135
                (void) session;
138
136
        }
139
137
        
140
 
        int doCreateTable(Session&, Table&, const identifier::Table& ident, drizzled::message::Table& );        
141
 
        int doDropTable(Session &, const identifier::Table& );
 
138
        int doCreateTable(Session&, Table&, const TableIdentifier& ident, drizzled::message::Table& );  
 
139
        int doDropTable(Session &, const TableIdentifier& );
142
140
        
143
 
        int doRenameTable(Session&, const identifier::Table &from, const identifier::Table &to);
 
141
        int doRenameTable(Session&, const TableIdentifier &from, const TableIdentifier &to);
144
142
        
145
143
        void doGetTableIdentifiers(drizzled::CachedDirectory &dir,
146
 
                                   const drizzled::identifier::Schema &schema,
147
 
                                   drizzled::identifier::Table::vector &set_of_identifiers) 
 
144
                                   const drizzled::SchemaIdentifier &schema,
 
145
                                   drizzled::TableIdentifier::vector &set_of_identifiers) 
148
146
        {
149
147
                std::set<std::string> set_of_names;
150
148
                
151
149
                doGetTableNames(dir, schema, set_of_names);
152
150
                for (std::set<std::string>::iterator set_iter = set_of_names.begin(); set_iter != set_of_names.end(); ++set_iter)
153
151
                {
154
 
                        set_of_identifiers.push_back(identifier::Table(schema, *set_iter));
 
152
                        set_of_identifiers.push_back(TableIdentifier(schema, *set_iter));
155
153
                }
156
154
        }
157
155
        
158
156
        void doGetTableNames(CachedDirectory&, 
159
 
                                        const identifier::Schema &schema, 
 
157
                                        const SchemaIdentifier &schema, 
160
158
                                        std::set<std::string> &set_of_names) 
161
159
        {
162
160
                bool isPBMS = schema.compare("PBMS");
170
168
        int doReleaseSavepoint(Session *session, NamedSavepoint &savepoint);
171
169
        const char **bas_ext() const;
172
170
 
173
 
  int doGetTableDefinition(Session&, const identifier::Table &identifier,
 
171
  int doGetTableDefinition(Session&, const TableIdentifier &identifier,
174
172
                                          drizzled::message::Table &table_proto)
175
173
  {
176
174
                int err;
188
186
                return EEXIST;
189
187
  }
190
188
 
191
 
        bool doDoesTableExist(Session&, const identifier::Table &identifier)
 
189
        bool doDoesTableExist(Session&, const TableIdentifier &identifier)
192
190
        {
193
191
                const char *tab_name = identifier.getTableName().c_str();
194
192
                const char *db_name = identifier.getSchemaName().c_str();
436
434
#endif
437
435
 
438
436
#ifdef DRIZZLED
439
 
bool  PBMSStorageEngine::doDropSchema(const drizzled::identifier::Schema &schema)
 
437
bool  PBMSStorageEngine::doDropSchema(const drizzled::SchemaIdentifier &schema)
440
438
{
441
439
        CSThread *self;
442
440
        PBMSResultRec result;
1045
1043
 
1046
1044
 
1047
1045
#ifdef DRIZZLED
1048
 
int PBMSStorageEngine::doCreateTable(Session&, Table&, const identifier::Table& , drizzled::message::Table& )
 
1046
int PBMSStorageEngine::doCreateTable(Session&, Table&, const TableIdentifier& , drizzled::message::Table& )
1049
1047
{
1050
1048
        /* You cannot create PBMS tables. */
1051
1049
        return( HA_ERR_WRONG_COMMAND );
1052
1050
}
1053
1051
 
1054
 
int PBMSStorageEngine::doDropTable(Session &, const identifier::Table& )
 
1052
int PBMSStorageEngine::doDropTable(Session &, const TableIdentifier& )
1055
1053
{
1056
1054
        /* You cannot delete PBMS tables. */
1057
1055
        return( 0 );
1058
1056
}
1059
1057
 
1060
 
int PBMSStorageEngine::doRenameTable(Session&, const identifier::Table &, const identifier::Table &)
 
1058
int PBMSStorageEngine::doRenameTable(Session&, const TableIdentifier &, const TableIdentifier &)
1061
1059
{
1062
1060
        /* You cannot rename PBMS tables. */
1063
1061
        return( HA_ERR_WRONG_COMMAND );