Index: Tests/session.eagle ================================================================== --- Tests/session.eagle +++ Tests/session.eagle @@ -196,15 +196,15 @@ }] } ############################################################################### -proc makeSomeChanges { db table types random {rowId ""} {count 5} } { +proc makeSomeChanges { db table types {rowId ""} {count 5} } { foreach type $types { switch -nocase -- $type { insert { - set text [appendArgs "inserted: " [getSomeText $random $count]] + set text [appendArgs "inserted: " [getSomeText false $count]] if {[string is integer -strict $rowId]} then { sql execute $db [subst { INSERT INTO ${table}(x, y) VALUES(?, ?); }] [list param1 Int32 $rowId] [list param2 String $text] @@ -213,11 +213,11 @@ INSERT INTO ${table}(y) VALUES(?); }] [list param1 String $text] } } update { - set text [appendArgs "updated: " [getSomeText $random $count]] + set text [appendArgs "updated: " [getSomeText false $count]] if {[string is integer -strict $rowId]} then { sql execute $db [subst { UPDATE ${table} SET y = ? WHERE x = ?; }] [list param1 String $text] [list param2 Int32 $rowId] @@ -343,18 +343,18 @@ set fileName(2) [getChangeSetFileName 2] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert insert] false + makeSomeChanges $db t1 [list insert insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session AttachTable null - makeSomeChanges $db t1 [list insert update delete] false + makeSomeChanges $db t1 [list insert update delete] set rawData [createChangeSetForSession $session] object removeref $rawData set stream(1) [object create -alias \ @@ -414,18 +414,18 @@ setupDb [set fileName session-1.2.db] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert insert insert] false + makeSomeChanges $db t1 [list insert insert insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session AttachTable null - makeSomeChanges $db t1 [list insert update delete] false + makeSomeChanges $db t1 [list insert update delete] set rawData [createChangeSetForSession $session] object removeref $rawData set changeSet(1) [$connection -alias CreateChangeSet $rawData] @@ -486,11 +486,11 @@ setupDb [set fileName session-1.3.db] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] lappend result IsEnabled [$session IsEnabled] @@ -499,11 +499,11 @@ lappend result IsEnabled [$session IsEnabled] $session SetToDisabled lappend result IsEnabled [$session IsEnabled] - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createChangeSetForSession $session] object removeref $rawData @@ -510,11 +510,11 @@ lappend result Length [$rawData Length] $session SetToEnabled lappend result IsEnabled [$session IsEnabled] - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createChangeSetForSession $session] object removeref $rawData @@ -545,11 +545,11 @@ setupDb [set fileName session-1.4.db] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] lappend result IsIndirect [$session IsIndirect] @@ -558,20 +558,20 @@ lappend result IsIndirect [$session IsIndirect] $session SetToIndirect lappend result IsIndirect [$session IsIndirect] - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createChangeSetForSession $session] object removeref $rawData $session SetToDirect lappend result IsIndirect [$session IsIndirect] - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] set rawData [createChangeSetForSession $session] object removeref $rawData @@ -603,43 +603,43 @@ setupDb [set fileName session-1.5.db] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session -marshalflags +DynamicCallback \ SetTableFilter tableFilterCallbackT1 null - makeSomeChanges $db t2 [list insert] false + makeSomeChanges $db t2 [list insert] lappend result IsEmpty [$session IsEmpty] lappend result MatchT2 [matchSession $connection $session { [$item TableName] eq "t2" }] - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] lappend result MatchT1 [matchSession $connection $session { [$item TableName] eq "t1" }] $session SetTableFilter null null - makeSomeChanges $db t2 [list insert] false + makeSomeChanges $db t2 [list insert] lappend result IsEmpty [$session IsEmpty] lappend result MatchT2 [matchSession $connection $session { [$item TableName] eq "t2" }] - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] lappend result IsEmpty [$session IsEmpty] lappend result MatchT1 [matchSession $connection $session { [$item TableName] eq "t1" }] @@ -677,22 +677,22 @@ setupDb [set fileName session-1.6.db] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert insert] false + makeSomeChanges $db t1 [list insert insert] set connection [getDbConnection] set rawData(1) [captureChangeSetRawData $connection main null { - makeSomeChanges $db t1 [list delete] false 1 + makeSomeChanges $db t1 [list delete] 1 }]; object removeref $rawData(1) - makeSomeChanges $db t1 [list insert] false 1 + makeSomeChanges $db t1 [list insert] 1 set rawData(2) [captureChangeSetRawData $connection main null { - makeSomeChanges $db t1 [list insert] false + makeSomeChanges $db t1 [list insert] }]; object removeref $rawData(2) set changeSet(1) [$connection -alias CreateChangeSet $rawData(1)] set changeSet(2) [$connection -alias CreateChangeSet $rawData(2)] set changeSet(3) [$changeSet(1) -alias CombineWith $changeSet(2)] @@ -741,20 +741,20 @@ setupDb [set fileName session-1.7.db] cleanupSomeText } -body { createTheSchema $db main - makeSomeChanges $db t1 [list insert insert] false + makeSomeChanges $db t1 [list insert insert] set result [list] lappend result [sql execute -execute reader -format list $db \ {SELECT x, y FROM t1 ORDER BY x;}] createTheSchema $db temp sql execute $db {INSERT INTO temp.t1 SELECT * FROM main.t1;} - makeSomeChanges $db temp.t1 [list insert insert] false + makeSomeChanges $db temp.t1 [list insert insert] set connection [getDbConnection] set session [$connection -alias CreateSession main] $session AttachTable null @@ -779,16 +779,10 @@ defineConstant.System.Data.SQLite.INTEROP_SESSION_EXTENSION} -result {{1\ {inserted: Alpha Bravo Charlie Delta Echo} 2 {inserted: Foxtrot Golf Hotel\ India Juliet}} {1 {inserted: Alpha Bravo Charlie Delta Echo} 2 {inserted:\ Foxtrot Golf Hotel India Juliet} 3 {inserted: Kilo Lima Mike November Oscar} 4\ {inserted: Papa Quebec Romeo Sierra Tango}}}} - -############################################################################### - - - - ############################################################################### rename conflictCallback "" rename tableFilterCallbackT1 ""