Skip to content

Commit

Permalink
--column-names-row, --data-start-row をテーブル個別指定できるように
Browse files Browse the repository at this point in the history
  • Loading branch information
@Narazaka
Narazaka committed Mar 30, 2018
1 parent 0803d65 commit a0dd725
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 17 deletions.
9 changes: 8 additions & 1 deletion Readme.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,17 @@ xlsx -> yaml (from) 変換で出力するseedファイルをID単位ごとに分

分割しておくと、複数人で同時に別のIDのデータを編集してコミットする等の場合に、コンフリクトがおこりにくくなります。

`(前削除桁数:)(xlsxファイル名/)seedテーブル名(:後削除桁数)(@fromまたは@to)(@key=プライマリキー名)`の形式で指定します。（複数指定はコマンドラインでは`,`区切り・GUIでは改行区切り）
`(前削除桁数:)(xlsxファイル名/)seedテーブル名(:後削除桁数)(@その他のオプション)`の形式で指定します。（複数指定はコマンドラインでは`,`区切り・GUIでは改行区切り）

xlsxファイル名を指定する場合はパスを含まずファイル名のみ（path/to/foo.xlsxではなくfoo.xlsx）で指定してください。

その他のオプション:

- @fromまたは@to: それぞれxlsx -> yaml (from) 変換、yaml -> xlsx (to) 変換のみでそのオプションが有効になります
- @key=プライマリキー名: プライマリキーを"id"以外にします
- @column-names-row=数値: --column-names-row をテーブル個別指定
- @data-start-row=数値: --data-start-row をテーブル個別指定

ID(プライマリキーを指定した場合はそのカラム)数値の桁を上の方から前削除桁数分、下の方から後削除桁数分削ったものがファイル名として使われます。

例:
Expand Down
32 changes: 18 additions & 14 deletions seedtable-test/SubdivideOptionTest.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,35 @@
namespace seedtable_test {
public class SubdivideOptionTest {
public static IEnumerable<object[]> Examples() {
yield return new object[] { "foos", "NO_NAME", "foos", false, 0, 0, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "foo.xlsx/foos", "foo.xlsx", "foos", false, 0, 0, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "foos:0", "NO_NAME", "foos", true, 0, 0, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "0:foos", "NO_NAME", "foos", true, 0, 0, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "foos:1", "NO_NAME", "foos", true, 0, 1, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "1:foos", "NO_NAME", "foos", true, 1, 0, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "2:foos:2", "NO_NAME", "foos", true, 2, 2, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "foos@NO_OPTION", "NO_NAME", "foos", false, 0, 0, "id", OnOperation.From | OnOperation.To };
yield return new object[] { "foos@from", "NO_NAME", "foos", false, 0, 0, "id", OnOperation.From };
yield return new object[] { "foos@TO", "NO_NAME", "foos", false, 0, 0, "id", OnOperation.To };
yield return new object[] { "foos@key=foo_id", "NO_NAME", "foos", false, 0, 0, "foo_id", OnOperation.From | OnOperation.To };
yield return new object[] { "foos@from@key=foo_id", "NO_NAME", "foos", false, 0, 0, "foo_id", OnOperation.From };
yield return new object[] { "1:foo.xlsx/foos:0@from@key=foo_id", "foo.xlsx", "foos", true, 1, 0, "foo_id", OnOperation.From };
yield return new object[] { "foos", "NO_NAME", "foos", false, 0, 0, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foo.xlsx/foos", "foo.xlsx", "foos", false, 0, 0, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foos:0", "NO_NAME", "foos", true, 0, 0, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "0:foos", "NO_NAME", "foos", true, 0, 0, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foos:1", "NO_NAME", "foos", true, 0, 1, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "1:foos", "NO_NAME", "foos", true, 1, 0, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "2:foos:2", "NO_NAME", "foos", true, 2, 2, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foos@NO_OPTION", "NO_NAME", "foos", false, 0, 0, "id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foos@from", "NO_NAME", "foos", false, 0, 0, "id", null, null, OnOperation.From };
yield return new object[] { "foos@TO", "NO_NAME", "foos", false, 0, 0, "id", null, null, OnOperation.To };
yield return new object[] { "foos@key=foo_id", "NO_NAME", "foos", false, 0, 0, "foo_id", null, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foos@column-names-row=9", "NO_NAME", "foos", false, 0, 0, "id", 9, null, OnOperation.From | OnOperation.To };
yield return new object[] { "foos@data-start-row=10", "NO_NAME", "foos", false, 0, 0, "id", null, 10, OnOperation.From | OnOperation.To };
yield return new object[] { "foos@from@key=foo_id", "NO_NAME", "foos", false, 0, 0, "foo_id", null, null, OnOperation.From };
yield return new object[] { "1:foo.xlsx/foos:0@from@key=foo_id@column-names-row=9", "foo.xlsx", "foos", true, 1, 0, "foo_id", 9, null, OnOperation.From };
}

[Theory]
[MemberData(nameof(Examples))]
public void Parse(string subdivideStr, string fileName, string sheetName, bool needSubdivide, int cutPrefix, int cutPostfix, string keyColumnName, OnOperation oonOperation) {
public void Parse(string subdivideStr, string fileName, string sheetName, bool needSubdivide, int cutPrefix, int cutPostfix, string keyColumnName, int? columnNamesRow, int? dataStartRow, OnOperation oonOperation) {
var subdivide = SheetNameWithSubdivide.FromMixed(subdivideStr);
Assert.True(subdivide.FileName.IsMatch(fileName));
Assert.True(subdivide.SheetName.IsMatch(sheetName));
Assert.Equal(subdivide.NeedSubdivide, needSubdivide);
Assert.Equal(subdivide.CutPrefix, cutPrefix);
Assert.Equal(subdivide.CutPostfix, cutPostfix);
Assert.Equal(subdivide.KeyColumnName, keyColumnName);
Assert.Equal(subdivide.ColumnNamesRow, columnNamesRow);
Assert.Equal(subdivide.DataStartRow, dataStartRow);
Assert.Equal(subdivide.OnOperation, oonOperation);
}
}
Expand Down
2 changes: 1 addition & 1 deletion seedtable/SeedTableInterface.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ public class CannotContinueException : InvalidOperationException { }
}

static SeedTableBase GetSeedTable(IExcelData excelData, string sheetName, CommonOptions options, SheetNameWithSubdivide subdivide) {
var seedTable = excelData.GetSeedTable(sheetName, options.columnNamesRow, options.dataStartRow, options.ignoreColumns, subdivide.KeyColumnName, options.versionColumn);
var seedTable = excelData.GetSeedTable(sheetName, subdivide.ColumnNamesRow ?? options.columnNamesRow, subdivide.DataStartRow ?? options.dataStartRow, options.ignoreColumns, subdivide.KeyColumnName, options.versionColumn);
if (seedTable.Errors.Count != 0) {
var skipExceptions = seedTable.Errors.Where(error => error is NoIdColumnException);
if (skipExceptions.Count() != 0) {
Expand Down
14 changes: 13 additions & 1 deletion seedtable/SheetNameWithSubdivide.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,23 @@ public class SheetNameWithSubdivide {
var options = result.Groups[5].Value == null ? new string[] { } : result.Groups[5].Value.Split('@');
var onOperation = OnOperation.From | OnOperation.To;
var keyColumnName = "id";
int? columnNamesRow = null;
int? dataStartRow = null;
foreach (var option in options) {
if (Regex.IsMatch(option, $"^(?:from|to)$", RegexOptions.IgnoreCase)) {
Enum.TryParse(option, true, out onOperation);
} else if (option.StartsWith("key=")) {
keyColumnName = option.Substring(4);
} else if (option.StartsWith("column-names-row=")) {
columnNamesRow = int.Parse(option.Substring(17));
} else if (option.StartsWith("data-start-row=")) {
dataStartRow = int.Parse(option.Substring(15));
}
}
var needSubdivide = cutPrefixStr.Length != 0 || cutPostfixStr.Length != 0;
var cutPrefix = cutPrefixStr.Length == 0 ? 0 : Convert.ToInt32(cutPrefixStr);
var cutPostfix = cutPostfixStr.Length == 0 ? 0 : Convert.ToInt32(cutPostfixStr);
return new SheetNameWithSubdivide(fileName, sheetName, needSubdivide, cutPrefix, cutPostfix, keyColumnName, onOperation);
return new SheetNameWithSubdivide(fileName, sheetName, needSubdivide, cutPrefix, cutPostfix, keyColumnName, columnNamesRow, dataStartRow, onOperation);
}

public Wildcard FileName { get; } = null;
Expand All @@ -33,6 +39,8 @@ public class SheetNameWithSubdivide {
public int CutPrefix { get; }
public int CutPostfix { get; }
public string KeyColumnName { get; }
public int? ColumnNamesRow { get; }
public int? DataStartRow { get; }
public OnOperation OnOperation { get; }

public SheetNameWithSubdivide(
Expand All @@ -42,6 +50,8 @@ public class SheetNameWithSubdivide {
int cutPrefix = 0,
int cutPostfix = 0,
string keyColumnName = "id",
int? columnNamesRow = null,
int? dataStartRow = null,
OnOperation onOperation = OnOperation.From | OnOperation.To
) {
FileName = new Wildcard(fileName);
Expand All @@ -50,6 +60,8 @@ public class SheetNameWithSubdivide {
CutPrefix = cutPrefix;
CutPostfix = cutPostfix;
KeyColumnName = keyColumnName;
ColumnNamesRow = columnNamesRow;
DataStartRow = dataStartRow;
OnOperation = onOperation;
}

Expand Down

0 comments on commit a0dd725

Please sign in to comment.