ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Integer columns can have the 'NOT NULL' modifier too.

Browse Source
This commit is contained in:
James Hawkins 2006-10-19 17:46:17 -07:00 committed by Alexandre Julliard
parent a66584e1a2
commit 279f8158f8
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/database.c
View File

@ -388,7 +388,9 @@ static LPWSTR msi_build_createsql_columns(LPWSTR *columns_data, LPWSTR *types, D
type = type_char; type = type_char;
sprintfW(size, size_fmt, ptr); sprintfW(size, size_fmt, ptr);
break; break;
case 'I': case 'i': case 'i':
lstrcpyW(extra, type_notnull);
case 'I':
if (len == 2) if (len == 2)
type = type_int; type = type_int;
else else

9
dlls/msi/tests/db.c
View File

@ -1433,17 +1433,14 @@ static void test_msiimport(void)
count = MsiRecordGetFieldCount(rec); count = MsiRecordGetFieldCount(rec);
ok(count == 9, "Expected 9, got %d\n", count); ok(count == 9, "Expected 9, got %d\n", count);
ok(check_record(rec, 1, "s255"), "Expected s255\n"); ok(check_record(rec, 1, "s255"), "Expected s255\n");
ok(check_record(rec, 2, "i2"), "Expected i2\n");
ok(check_record(rec, 3, "i2"), "Expected i2\n");
ok(check_record(rec, 4, "I2"), "Expected I2\n"); ok(check_record(rec, 4, "I2"), "Expected I2\n");
ok(check_record(rec, 5, "i4"), "Expected i4\n");
ok(check_record(rec, 6, "I4"), "Expected I4\n"); ok(check_record(rec, 6, "I4"), "Expected I4\n");
ok(check_record(rec, 7, "S255"), "Expected S255\n"); ok(check_record(rec, 7, "S255"), "Expected S255\n");
ok(check_record(rec, 8, "S0"), "Expected S0\n"); ok(check_record(rec, 8, "S0"), "Expected S0\n");
ok(check_record(rec, 9, "s0"), "Expected s0\n"); ok(check_record(rec, 9, "s0"), "Expected s0\n");
todo_wine
{
ok(check_record(rec, 2, "i2"), "Expected i2\n");
ok(check_record(rec, 3, "i2"), "Expected i2\n");
ok(check_record(rec, 5, "i4"), "Expected i4\n");
}
MsiCloseHandle(rec); MsiCloseHandle(rec);
query = "SELECT * FROM `TestTable`"; query = "SELECT * FROM `TestTable`";

4
dlls/msi/tests/install.c
View File

@ -764,13 +764,13 @@ static void test_packagecoltypes(void)
count = MsiRecordGetFieldCount( rec ); count = MsiRecordGetFieldCount( rec );
ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n"); ok(r == ERROR_SUCCESS, "MsiViewGetColumnInfo failed\n");
ok(count == 6, "Expected 6, got %d\n", count); ok(count == 6, "Expected 6, got %d\n", count);
ok(check_record(rec, 1, "i2"), "wrong column label\n");
ok(check_record(rec, 2, "i4"), "wrong column label\n");
ok(check_record(rec, 4, "S255"), "wrong column label\n"); ok(check_record(rec, 4, "S255"), "wrong column label\n");
ok(check_record(rec, 5, "S32"), "wrong column label\n"); ok(check_record(rec, 5, "S32"), "wrong column label\n");
ok(check_record(rec, 6, "S72"), "wrong column label\n"); ok(check_record(rec, 6, "S72"), "wrong column label\n");
todo_wine todo_wine
{ {
ok(check_record(rec, 1, "i2"), "wrong column label\n");
ok(check_record(rec, 2, "i4"), "wrong column label\n");
ok(check_record(rec, 3, "L64"), "wrong column label\n"); ok(check_record(rec, 3, "L64"), "wrong column label\n");
} }