← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

edit

Show diffs side-by-side

added added

removed removed

Lines of Context:
drizzled/statement/alter_schema.cc
18
18
 *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
19
19
 */
20
20
 
21
 
#include <config.h>
 
21
#include "config.h"
22
22
#include <drizzled/show.h>
23
23
#include <drizzled/session.h>
24
24
#include <drizzled/statement/alter_schema.h>
25
25
#include <drizzled/plugin/storage_engine.h>
26
 
#include <drizzled/schema.h>
 
26
#include <drizzled/db.h>
27
27
#include <drizzled/message.h>
28
28
 
29
29
#include <string>
35
35
 
36
36
bool statement::AlterSchema::execute()
37
37
{
38
 
  LEX_STRING *db= &getSession()->getLex()->name;
 
38
  LEX_STRING *db= &session->lex->name;
39
39
  message::schema::shared_ptr old_definition;
40
40
 
41
41
  if (not validateSchemaOptions())
43
43
 
44
44
  identifier::Schema schema_identifier(string(db->str, db->length));
45
45
 
46
 
  if (not schema::check(*getSession(), schema_identifier))
 
46
  if (not check_db_name(session, schema_identifier))
47
47
  {
48
48
    my_error(ER_WRONG_DB_NAME, schema_identifier);
49
49
 
51
51
  }
52
52
 
53
53
  identifier::Schema identifier(db->str);
54
 
  if (not (old_definition= plugin::StorageEngine::getSchemaDefinition(identifier)))
 
54
  if (not plugin::StorageEngine::getSchemaDefinition(identifier, old_definition))
55
55
  {
56
56
    my_error(ER_SCHEMA_DOES_NOT_EXIST, identifier); 
57
57
    return true;
58
58
  }
59
59
 
60
 
  if (getSession()->inTransaction())
 
60
  if (session->inTransaction())
61
61
  {
62
 
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
 
62
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
 
63
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
 
64
               MYF(0));
63
65
    return true;
64
66
  }
65
67
  /*
83
85
  
84
86
  drizzled::message::update(schema_message);
85
87
 
86
 
  bool res= schema::alter(*getSession(), schema_message, *old_definition);
 
88
  bool res= alter_db(session, schema_message, old_definition);
87
89
 
88
90
  return not res;
89
91
}