← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to drizzled/statement/alter_schema.cc

  • Committer: Stewart Smith
  • Date: 2011-02-24 07:46:16 UTC
  • mto: (2200.1.2 drizzle-staging)
  • mto: This revision was merged to the branch mainline in revision 2201.
  • Revision ID: stewart@flamingspork.com-20110224074616-l2rmp406vf78x71q
add ER_NO_LOCK_HELD error code, and expect it in case of UNLOCK TABLES without any locks held.

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/db.h>
 
26
#include <drizzled/schema.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= &session->lex->name;
 
38
  LEX_STRING *db= &getSession()->getLex()->name;
39
39
  message::schema::shared_ptr old_definition;
40
40
 
41
41
  if (not validateSchemaOptions())
42
42
    return true;
43
43
 
44
 
  SchemaIdentifier schema_identifier(string(db->str, db->length));
 
44
  identifier::Schema schema_identifier(string(db->str, db->length));
45
45
 
46
 
  if (not check_db_name(session, schema_identifier))
 
46
  if (not schema::check(*getSession(), schema_identifier))
47
47
  {
48
 
    std::string path;
49
 
    schema_identifier.getSQLPath(path);
50
 
    my_error(ER_WRONG_DB_NAME, MYF(0), path.c_str());
 
48
    my_error(ER_WRONG_DB_NAME, schema_identifier);
51
49
 
52
50
    return false;
53
51
  }
54
52
 
55
 
  SchemaIdentifier identifier(db->str);
56
 
  if (not plugin::StorageEngine::getSchemaDefinition(identifier, old_definition))
 
53
  identifier::Schema identifier(db->str);
 
54
  if (not (old_definition= plugin::StorageEngine::getSchemaDefinition(identifier)))
57
55
  {
58
 
    my_error(ER_SCHEMA_DOES_NOT_EXIST, MYF(0), db->str);
 
56
    my_error(ER_SCHEMA_DOES_NOT_EXIST, identifier); 
59
57
    return true;
60
58
  }
61
59
 
62
 
  if (session->inTransaction())
 
60
  if (getSession()->inTransaction())
63
61
  {
64
 
    my_message(ER_LOCK_OR_ACTIVE_TRANSACTION, 
65
 
               ER(ER_LOCK_OR_ACTIVE_TRANSACTION), 
66
 
               MYF(0));
 
62
    my_error(ER_TRANSACTIONAL_DDL_NOT_SUPPORTED, MYF(0));
67
63
    return true;
68
64
  }
69
65
  /*
70
66
    @todo right now the logic for alter schema is just sitting here, at some point this should be packaged up in a class/etc.
71
67
  */
72
68
 
 
69
  // First initialize the schema message
 
70
  drizzled::message::schema::init(schema_message, old_definition->name());
 
71
 
73
72
  // We set the name from the old version to keep case preference
74
 
  schema_message.set_name(old_definition->name());
75
73
  schema_message.set_version(old_definition->version());
76
74
  schema_message.set_uuid(old_definition->uuid());
77
75
  schema_message.mutable_engine()->set_name(old_definition->engine().name());
85
83
  
86
84
  drizzled::message::update(schema_message);
87
85
 
88
 
  bool res= mysql_alter_db(session, schema_message);
 
86
  bool res= schema::alter(*getSession(), schema_message, *old_definition);
89
87
 
90
88
  return not res;
91
89
}