lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-01-18 19:51:45 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix bug with table prefix in data migration

Browse Source 
We weren't adding the "_" after the table prefix...

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-20 23:13:40 -07:00
parent 1024a7809a
commit cf7d179116
1 changed files with 52 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
src/Orchard/Data/Migration/Interpreters/DefaultDataMigrationInterpreter.cs
View File

@@ -23,11 +23,11 @@ namespace Orchard.Data.Migration.Interpreters {
private readonly ISessionFactoryHolder _sessionFactoryHolder; private readonly ISessionFactoryHolder _sessionFactoryHolder;
private readonly IReportsCoordinator _reportsCoordinator; private readonly IReportsCoordinator _reportsCoordinator;
private const char Space = ' ' ; private const char Space = ' ';
public DefaultDataMigrationInterpreter( public DefaultDataMigrationInterpreter(
ShellSettings shellSettings, ShellSettings shellSettings,
ISessionLocator sessionLocator, ISessionLocator sessionLocator,
IEnumerable<ICommandInterpreter> commandInterpreters, IEnumerable<ICommandInterpreter> commandInterpreters,
ISessionFactoryHolder sessionFactoryHolder, ISessionFactoryHolder sessionFactoryHolder,
IReportsCoordinator reportsCoordinator) { IReportsCoordinator reportsCoordinator) {
@@ -53,7 +53,7 @@ namespace Orchard.Data.Migration.Interpreters {
public override void Visit(CreateTableCommand command) { public override void Visit(CreateTableCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
@@ -61,22 +61,22 @@ namespace Orchard.Data.Migration.Interpreters {
builder.Append(_dialect.CreateMultisetTableString) builder.Append(_dialect.CreateMultisetTableString)
.Append(' ') .Append(' ')
.Append(_dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.Name)) .Append(_dialect.QuoteForTableName(PrefixTableName(command.Name)))
.Append(" ("); .Append(" (");
var appendComma = false; var appendComma = false;
foreach(var createColumn in command.TableCommands.OfType<CreateColumnCommand>()) { foreach (var createColumn in command.TableCommands.OfType<CreateColumnCommand>()) {
if(appendComma) { if (appendComma) {
builder.Append(", "); builder.Append(", ");
} }
appendComma = true; appendComma = true;
Visit(builder, createColumn); Visit(builder, createColumn);
} }
var primaryKeys = command.TableCommands.OfType<CreateColumnCommand>().Where(ccc => ccc.IsPrimaryKey).Select(ccc=>ccc.ColumnName); var primaryKeys = command.TableCommands.OfType<CreateColumnCommand>().Where(ccc => ccc.IsPrimaryKey).Select(ccc => ccc.ColumnName);
if(primaryKeys.Any()) { if (primaryKeys.Any()) {
if ( appendComma ) { if (appendComma) {
builder.Append(", "); builder.Append(", ");
} }
@@ -92,58 +92,64 @@ namespace Orchard.Data.Migration.Interpreters {
RunPendingStatements(); RunPendingStatements();
} }
private string PrefixTableName(string tableName) {
if (string.IsNullOrEmpty(_shellSettings.DataTablePrefix))
return tableName;
return _shellSettings.DataTablePrefix + "_" + tableName;
}
public override void Visit(DropTableCommand command) { public override void Visit(DropTableCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
var builder = new StringBuilder(); var builder = new StringBuilder();
builder.Append(_dialect.GetDropTableString(_shellSettings.DataTablePrefix + command.Name)); builder.Append(_dialect.GetDropTableString(PrefixTableName(command.Name)));
_sqlStatements.Add(builder.ToString()); _sqlStatements.Add(builder.ToString());
RunPendingStatements(); RunPendingStatements();
} }
public override void Visit(AlterTableCommand command) { public override void Visit(AlterTableCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
if(command.TableCommands.Count == 0) { if (command.TableCommands.Count == 0) {
return; return;
} }
// drop columns // drop columns
foreach ( var dropColumn in command.TableCommands.OfType<DropColumnCommand>() ) { foreach (var dropColumn in command.TableCommands.OfType<DropColumnCommand>()) {
var builder = new StringBuilder(); var builder = new StringBuilder();
Visit(builder, dropColumn); Visit(builder, dropColumn);
RunPendingStatements(); RunPendingStatements();
} }
// add columns // add columns
foreach ( var addColumn in command.TableCommands.OfType<AddColumnCommand>() ) { foreach (var addColumn in command.TableCommands.OfType<AddColumnCommand>()) {
var builder = new StringBuilder(); var builder = new StringBuilder();
Visit(builder, addColumn); Visit(builder, addColumn);
RunPendingStatements(); RunPendingStatements();
} }
// alter columns // alter columns
foreach ( var alterColumn in command.TableCommands.OfType<AlterColumnCommand>() ) { foreach (var alterColumn in command.TableCommands.OfType<AlterColumnCommand>()) {
var builder = new StringBuilder(); var builder = new StringBuilder();
Visit(builder, alterColumn); Visit(builder, alterColumn);
RunPendingStatements(); RunPendingStatements();
} }
// add index // add index
foreach ( var addIndex in command.TableCommands.OfType<AddIndexCommand>() ) { foreach (var addIndex in command.TableCommands.OfType<AddIndexCommand>()) {
var builder = new StringBuilder(); var builder = new StringBuilder();
Visit(builder, addIndex); Visit(builder, addIndex);
RunPendingStatements(); RunPendingStatements();
} }
// drop index // drop index
foreach ( var dropIndex in command.TableCommands.OfType<DropIndexCommand>() ) { foreach (var dropIndex in command.TableCommands.OfType<DropIndexCommand>()) {
var builder = new StringBuilder(); var builder = new StringBuilder();
Visit(builder, dropIndex); Visit(builder, dropIndex);
RunPendingStatements(); RunPendingStatements();
@@ -152,43 +158,43 @@ namespace Orchard.Data.Migration.Interpreters {
} }
public void Visit(StringBuilder builder, AddColumnCommand command) { public void Visit(StringBuilder builder, AddColumnCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
builder.AppendFormat("alter table {0} add column ", _dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.TableName)); builder.AppendFormat("alter table {0} add column ", _dialect.QuoteForTableName(PrefixTableName(command.TableName)));
Visit(builder, (CreateColumnCommand)command); Visit(builder, (CreateColumnCommand)command);
_sqlStatements.Add(builder.ToString()); _sqlStatements.Add(builder.ToString());
} }
public void Visit(StringBuilder builder, DropColumnCommand command) { public void Visit(StringBuilder builder, DropColumnCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
builder.AppendFormat("alter table {0} drop column {1}", builder.AppendFormat("alter table {0} drop column {1}",
_dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.TableName), _dialect.QuoteForTableName(PrefixTableName(command.TableName)),
_dialect.QuoteForColumnName(command.ColumnName)); _dialect.QuoteForColumnName(command.ColumnName));
_sqlStatements.Add(builder.ToString()); _sqlStatements.Add(builder.ToString());
} }
public void Visit(StringBuilder builder, AlterColumnCommand command) { public void Visit(StringBuilder builder, AlterColumnCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
builder.AppendFormat("alter table {0} alter column {1} ", builder.AppendFormat("alter table {0} alter column {1} ",
_dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.TableName), _dialect.QuoteForTableName(PrefixTableName(command.TableName)),
_dialect.QuoteForColumnName(command.TableName)); _dialect.QuoteForColumnName(command.TableName));
// type // type
if ( command.DbType != DbType.Object ) { if (command.DbType != DbType.Object) {
builder.Append(GetTypeName(command.DbType, command.Length, command.Precision, command.Scale)); builder.Append(GetTypeName(command.DbType, command.Length, command.Precision, command.Scale));
} }
// [default value] // [default value]
if ( !string.IsNullOrEmpty(command.Default) ) { if (!string.IsNullOrEmpty(command.Default)) {
builder.Append(" default ").Append(command.Default).Append(Space); builder.Append(" default ").Append(command.Default).Append(Space);
} }
_sqlStatements.Add(builder.ToString()); _sqlStatements.Add(builder.ToString());
@@ -196,12 +202,12 @@ namespace Orchard.Data.Migration.Interpreters {
public void Visit(StringBuilder builder, AddIndexCommand command) { public void Visit(StringBuilder builder, AddIndexCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
builder.AppendFormat("alter table {0} add index {1} ({2}) ", builder.AppendFormat("alter table {0} add index {1} ({2}) ",
_dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.TableName), _dialect.QuoteForTableName(PrefixTableName(command.TableName)),
_dialect.QuoteForColumnName(command.IndexName), _dialect.QuoteForColumnName(command.IndexName),
String.Join(", ", command.ColumnNames)); String.Join(", ", command.ColumnNames));
@@ -209,12 +215,12 @@ namespace Orchard.Data.Migration.Interpreters {
} }
public void Visit(StringBuilder builder, DropIndexCommand command) { public void Visit(StringBuilder builder, DropIndexCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
builder.AppendFormat("alter table {0} drop index {1}", builder.AppendFormat("alter table {0} drop index {1}",
_dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.TableName), _dialect.QuoteForTableName(PrefixTableName(command.TableName)),
_dialect.QuoteForColumnName(command.IndexName)); _dialect.QuoteForColumnName(command.IndexName));
_sqlStatements.Add(builder.ToString()); _sqlStatements.Add(builder.ToString());
} }
@@ -233,14 +239,14 @@ namespace Orchard.Data.Migration.Interpreters {
} }
public override void Visit(CreateForeignKeyCommand command) { public override void Visit(CreateForeignKeyCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
var builder = new StringBuilder(); var builder = new StringBuilder();
builder.Append("alter table ") builder.Append("alter table ")
.Append(_dialect.QuoteForTableName(_shellSettings.DataTablePrefix + command.SrcTable)); .Append(_dialect.QuoteForTableName(PrefixTableName(command.SrcTable)));
builder.Append(_dialect.GetAddForeignKeyConstraintString(command.Name, builder.Append(_dialect.GetAddForeignKeyConstraintString(command.Name,
command.SrcColumns, command.SrcColumns,
@@ -254,7 +260,7 @@ namespace Orchard.Data.Migration.Interpreters {
} }
public override void Visit(DropForeignKeyCommand command) { public override void Visit(DropForeignKeyCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
@@ -275,24 +281,24 @@ namespace Orchard.Data.Migration.Interpreters {
} }
private void Visit(StringBuilder builder, CreateColumnCommand command) { private void Visit(StringBuilder builder, CreateColumnCommand command) {
if ( ExecuteCustomInterpreter(command) ) { if (ExecuteCustomInterpreter(command)) {
return; return;
} }
// name // name
builder.Append(_dialect.QuoteForColumnName(command.ColumnName)).Append(Space); builder.Append(_dialect.QuoteForColumnName(command.ColumnName)).Append(Space);
if (!command.IsIdentity || _dialect.HasDataTypeInIdentityColumn ) { if (!command.IsIdentity || _dialect.HasDataTypeInIdentityColumn) {
builder.Append(GetTypeName(command.DbType, command.Length, command.Precision, command.Scale)); builder.Append(GetTypeName(command.DbType, command.Length, command.Precision, command.Scale));
} }
// append identity if handled // append identity if handled
if ( command.IsIdentity && _dialect.SupportsIdentityColumns ) { if (command.IsIdentity && _dialect.SupportsIdentityColumns) {
builder.Append(Space).Append(_dialect.IdentityColumnString); builder.Append(Space).Append(_dialect.IdentityColumnString);
} }
// [default value] // [default value]
if ( !string.IsNullOrEmpty(command.Default) ) { if (!string.IsNullOrEmpty(command.Default)) {
builder.Append(" default ").Append(command.Default).Append(Space); builder.Append(" default ").Append(command.Default).Append(Space);
} }
@@ -304,7 +310,7 @@ namespace Orchard.Data.Migration.Interpreters {
: string.Empty); : string.Empty);
// append unique if handled, otherwise at the end of the satement // append unique if handled, otherwise at the end of the satement
if ( command.IsUnique && _dialect.SupportsUnique ) { if (command.IsUnique && _dialect.SupportsUnique) {
builder.Append(" unique"); builder.Append(" unique");
} }
@@ -314,9 +320,9 @@ namespace Orchard.Data.Migration.Interpreters {
var connection = _session.Connection; var connection = _session.Connection;
foreach ( var sqlStatement in _sqlStatements ) { foreach (var sqlStatement in _sqlStatements) {
Logger.Debug(sqlStatement); Logger.Debug(sqlStatement);
using ( var command = connection.CreateCommand() ) { using (var command = connection.CreateCommand()) {
command.CommandText = sqlStatement; command.CommandText = sqlStatement;
command.ExecuteNonQuery(); command.ExecuteNonQuery();
} }
@@ -333,7 +339,7 @@ namespace Orchard.Data.Migration.Interpreters {
.OfType<ICommandInterpreter<T>>() .OfType<ICommandInterpreter<T>>()
.FirstOrDefault(); .FirstOrDefault();
if ( interpreter != null ) { if (interpreter != null) {
_sqlStatements.AddRange(interpreter.CreateStatements(command)); _sqlStatements.AddRange(interpreter.CreateStatements(command));
RunPendingStatements(); RunPendingStatements();
return true; return true;