Index: Tests/tkt-58ed318f2f.eagle ================================================================== --- Tests/tkt-58ed318f2f.eagle +++ Tests/tkt-58ed318f2f.eagle @@ -54,12 +54,11 @@ INSERT INTO t1 (x, y) VALUES('0', '1'); } sql execute -execute reader -format list $db "SELECT x, y FROM t1;" - expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == 2 && \ - [getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == -1} + expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == 2} } -cleanup { cleanupDb $fileName unset -nocomplain db fileName } -constraints \ @@ -81,12 +80,11 @@ INSERT INTO t1 (x, y) VALUES('0', '1'); } sql execute -execute reader -format list $db "SELECT x, y FROM t1;" - expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == 2 && \ - [getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == -1} + expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == 2} } -cleanup { cleanupDb $fileName unset -nocomplain db fileName } -constraints \ @@ -109,12 +107,11 @@ INSERT INTO t1 (x, y) VALUES('0', '1'); } sql execute -execute reader -format list $db "SELECT x, y FROM t1;" - expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == -1 && \ - [getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == -1} + expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == -1} } -cleanup { cleanupDb $fileName unset -nocomplain db fileName } -constraints \ @@ -137,12 +134,11 @@ INSERT INTO t1 (x, y) VALUES('0', '1'); } sql execute -execute reader -format list $db "SELECT x, y FROM t1;" - expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == -1 && \ - [getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == -1} + expr {[getSettingReadCount Use_SQLiteConvert_DefaultDbType] == -1} } -cleanup { cleanupDb $fileName unset -nocomplain db fileName } -constraints \ @@ -153,12 +149,134 @@ reportSQLiteResources $test_channel true ############################################################################### -runTest {test tkt-58ed318f2f-1.5 {zero DefaultDbType settings read} -setup { - setupDb [set fileName tkt-58ed318f2f-1.5.db] "" "" "" NoConvertSettings +runTest {test tkt-58ed318f2f-1.5 {standard GetDefaultTypeName usage} -setup { + setupDb [set fileName tkt-58ed318f2f-1.5.db] +} -body { + set connection [getDbConnection] + + sql execute $db { + CREATE TABLE t1(x, y); + INSERT INTO t1 (x, y) VALUES(0, 1); + INSERT INTO t1 (x, y) VALUES('0', '1'); + } + + set columns [$connection GetSchema COLUMNS] + + expr {[getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == 2} +} -cleanup { + cleanupDb $fileName + + freeDbConnection + + unset -nocomplain columns connection db fileName +} -constraints \ +{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ +buildConfiguration.Debug} -result {True}} + +############################################################################### + +reportSQLiteResources $test_channel true + +############################################################################### + +runTest {test tkt-58ed318f2f-1.6 {no property GetDefaultTypeName usage} -setup { + setupDb [set fileName tkt-58ed318f2f-1.6.db] "" "" "" UseConnectionTypes +} -body { + set connection [getDbConnection] + + sql execute $db { + CREATE TABLE t1(x, y); + INSERT INTO t1 (x, y) VALUES(0, 1); + INSERT INTO t1 (x, y) VALUES('0', '1'); + } + + set columns [$connection GetSchema COLUMNS] + + expr {[getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == 2} +} -cleanup { + cleanupDb $fileName + + freeDbConnection + + unset -nocomplain columns connection db fileName +} -constraints \ +{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ +buildConfiguration.Debug} -result {True}} + +############################################################################### + +reportSQLiteResources $test_channel true + +############################################################################### + +runTest {test tkt-58ed318f2f-1.7 {no flag GetDefaultTypeName usage} -setup { + setupDb [set fileName tkt-58ed318f2f-1.7.db] "" "" "" "" \ + "DefaultDbType=String;" +} -body { + set connection [getDbConnection] + + sql execute $db { + CREATE TABLE t1(x, y); + INSERT INTO t1 (x, y) VALUES(0, 1); + INSERT INTO t1 (x, y) VALUES('0', '1'); + } + + set columns [$connection GetSchema COLUMNS] + + expr {[getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == -1} +} -cleanup { + cleanupDb $fileName + + freeDbConnection + + unset -nocomplain columns connection db fileName +} -constraints \ +{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ +buildConfiguration.Debug} -result {True}} + +############################################################################### + +reportSQLiteResources $test_channel true + +############################################################################### + +runTest {test tkt-58ed318f2f-1.8 {zero GetDefaultTypeName usage} -setup { + setupDb [set fileName tkt-58ed318f2f-1.8.db] "" "" "" UseConnectionTypes \ + "DefaultTypeName=TEXT;" +} -body { + set connection [getDbConnection] + + sql execute $db { + CREATE TABLE t1(x, y); + INSERT INTO t1 (x, y) VALUES(0, 1); + INSERT INTO t1 (x, y) VALUES('0', '1'); + } + + set columns [$connection GetSchema COLUMNS] + + expr {[getSettingReadCount Use_SQLiteConvert_DefaultTypeName] == -1} +} -cleanup { + cleanupDb $fileName + + freeDbConnection + + unset -nocomplain columns connection db fileName +} -constraints \ +{eagle monoBug28 command.sql compile.DATA SQLite System.Data.SQLite\ +buildConfiguration.Debug} -result {True}} + +############################################################################### + +reportSQLiteResources $test_channel true + +############################################################################### + +runTest {test tkt-58ed318f2f-1.9 {zero DefaultDbType settings read} -setup { + setupDb [set fileName tkt-58ed318f2f-1.9.db] "" "" "" NoConvertSettings } -body { sql execute $db { CREATE TABLE t1(x, y); INSERT INTO t1 (x, y) VALUES(0, 1); INSERT INTO t1 (x, y) VALUES('0', '1'); @@ -179,12 +297,12 @@ reportSQLiteResources $test_channel true ############################################################################### -runTest {test tkt-58ed318f2f-1.6 {zero DefaultTypeName settings read} -setup { - setupDb [set fileName tkt-58ed318f2f-1.6.db] "" "" "" NoConvertSettings +runTest {test tkt-58ed318f2f-1.10 {zero DefaultTypeName settings read} -setup { + setupDb [set fileName tkt-58ed318f2f-1.10.db] "" "" "" NoConvertSettings } -body { set connection [getDbConnection] sql execute $db { CREATE TABLE t1(x, y); @@ -209,12 +327,12 @@ reportSQLiteResources $test_channel true ############################################################################### -runTest {test tkt-58ed318f2f-1.7 {normal SQLiteConvert settings usage} -setup { - setupDb [set fileName tkt-58ed318f2f-1.7.db] +runTest {test tkt-58ed318f2f-1.11 {normal SQLiteConvert settings usage} -setup { + setupDb [set fileName tkt-58ed318f2f-1.11.db] } -body { set connection [getDbConnection] sql execute $db { CREATE TABLE t1(x, y); @@ -244,12 +362,12 @@ reportSQLiteResources $test_channel true ############################################################################### -runTest {test tkt-58ed318f2f-1.8 {zero SQLiteConvert settings usage} -setup { - setupDb [set fileName tkt-58ed318f2f-1.8.db] "" "" "" NoConvertSettings +runTest {test tkt-58ed318f2f-1.12 {zero SQLiteConvert settings usage} -setup { + setupDb [set fileName tkt-58ed318f2f-1.12.db] "" "" "" NoConvertSettings } -body { set connection [getDbConnection] sql execute $db { CREATE TABLE t1(x, y);