Skip to content

Fix CRUD operations in SQLRDD, tested with bBrowser #1972

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobertvanderHulst merged 1 commit into from
Jun 7, 2026
+56 −30
Merged

Fix CRUD operations in SQLRDD, tested with bBrowser #1972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 44 additions & 23 deletions src/Runtime/XSharp.SQLRdd/RDD/SQLRDD-Main.prg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,20 +173,21 @@ partial class SQLRDD inherit Workarea
self:_updatableColumns := List<RddFieldInfo>{}
self:_keyColumns := List<RddFieldInfo>{}
self:_numHiddenColumns := 0
var colNo := 0
foreach var oCol in _oTd:Columns
var oField := oCol:ColumnInfo
if ! String.Equals(oField:ColumnName, oField:Name, StringComparison.OrdinalIgnoreCase)
oField:Alias := oField:ColumnName:Trim():ToUpperInvariant()
endif

if oCol:ColumnFlags:HasFlag(SqlDbColumnFlags.Recno)
self:_recnoColumNo := oField:Ordinal
self:_recnoColumNo := colNo
oField:Flags |= DBFFieldFlags.AutoIncrement
oField:Flags |= DBFFieldFlags.System
self:_numHiddenColumns += 1
lhasRecnoColumn := true
elseif oCol:ColumnFlags:HasFlag(SqlDbColumnFlags.Deleted)
self:_deletedColumnNo := oField:Ordinal
self:_deletedColumnNo := colNo
self:_deletedColumnIsLogic := oField:FieldType == DbFieldType.Logic
oField:Flags |= DBFFieldFlags.System
self:_numHiddenColumns += 1
Expand All @@ -208,6 +209,7 @@ partial class SQLRDD inherit Workarea
self:_updatableColumns:Add(oField)
endif
ENDIF
colNo++
next

if !lhasRecnoColumn .and. self:_tableMode = TableMode.Table
Expand Down Expand Up @@ -240,6 +242,7 @@ partial class SQLRDD inherit Workarea
SELF:_hasEOF := TRUE
endif
_command:CommandText := cQuery
self:_ForceOpen()
return true
end method

Expand All @@ -258,7 +261,6 @@ partial class SQLRDD inherit Workarea
var key := (dword) self:_builder:GetNextKey()
var row := self:DataTable:NewRow()
self:DataTable:Rows:Add(row)
_updatedRows:Add(row)
if _emptyValues == null
self:_GetEmptyValues()
endif
Expand All @@ -270,10 +272,10 @@ partial class SQLRDD inherit Workarea
row[c] := SELF:_HandleNullDate(values[c:Ordinal],c)
endif
next
// if self:_recnoColumNo > -1
// self:_recordKeyCache:Add(key, (DWORD) SELF:RowCount-1)
// endif
SELF:_rowNumber := SELF:DataTable:Rows:Count
self:_ExecuteInsertStatement(row)
row:AcceptChanges()
_updatedRowIds:Add((int)row[self:_recnoColumNo])
SELF:RowNumber := SELF:DataTable:Rows:Count
self:_serverReccount += 1
SELF:_SetBOF(FALSE)
SELF:_SetEOF(FALSE)
Expand All @@ -289,8 +291,11 @@ partial class SQLRDD inherit Workarea
/// When the area is in Tablemode, and no data has been read before, then this will trigger fetching the data from the database
/// </remarks>
override method GetValue(nFldPos as int) as object
if self:CurrentRow == null
return null
endif

// nFldPos is 1 based, the RDD compiles with /az+
SELF:_ForceOpen()
if nFldPos > 0 .and. nFldPos <= self:RealFieldCount
var col := self:_GetColumn(nFldPos)
nFldPos -= 1
Expand Down Expand Up @@ -363,8 +368,8 @@ partial class SQLRDD inherit Workarea
var col := self:_GetColumn(nFldPos)
if SELF:_updatableColumns:Contains(col)
var row := SELF:CurrentRow
if !_updatedRows:Contains(row)
_updatedRows:Add(row)
if !_updatedRowIds:Contains((int)row[self:_recnoColumNo])
_updatedRowIds:Add((int)row[self:_recnoColumNo])
endif

row[nFldPos-1] := SELF:_HandleNullDate(oValue,self:DataTable:Columns[nFldPos-1])
Expand All @@ -380,6 +385,7 @@ partial class SQLRDD inherit Workarea
/// <summary>Write the contents of a work area's memory to the data store (usually a disk).</summary>
/// <returns><include file="CoreComments.xml" path="Comments/TrueOrFalse/*" /></returns>
override method GoCold() as logic
local row as DataRow
var current := SELF:CurrentRow
if current == null
return false
Expand All @@ -398,8 +404,14 @@ partial class SQLRDD inherit Workarea
return false
endif

foreach var row in _updatedRows
foreach var rowId in _updatedRowIds
try
foreach tableRow as DataRow in self:DataTable:Rows
if (int)tableRow[self:_recnoColumNo] = rowId
row := tableRow
endif
next

// Check row lock
dbLockInfo:RecId := row[_oTd:RecnoColumn]
SELF:CheckLock(dbLockInfo, StringBuilder{}, myLock, otherLock)
Expand Down Expand Up @@ -460,12 +472,12 @@ partial class SQLRDD inherit Workarea
else
self:DataTable:RejectChanges()
endif
_updatedRows:Clear()
// TODO: thomas optimize. Change reccount when adding or deleting a row above instead of reloading data from DB with _GetRecCount
_updatedRowIds:Clear()
self:_GetRecCount()
endif
return lOk
end method

override method GoHot() as logic
return true
end method
Expand Down Expand Up @@ -502,9 +514,7 @@ partial class SQLRDD inherit Workarea
row[_deletedColumnNo] := 1
endif
endif
// Must position the DBF on the right row for the deletion
super:GoTo((DWORD) SELF:RowNumber)
return super:Delete()
return true
end method

/// <summary>Remove the deletion marker from the row at the current cursor position.</summary>
Expand Down Expand Up @@ -673,16 +683,18 @@ partial class SQLRDD inherit Workarea
RETURN SELF:_GotoRow((LONG) nRec)
ENDIF
// Check to see if we have the record in the current buffer
var nCount := SELF:DataTable:Rows:Count
FOR VAR nRow := 1 to nCount
SELF:RowNumber := nRow +1
IF SELF:RecNo == nRec
var rowIndex := 1
foreach oRow as DataRow in SELF:DataTable:Rows
if (int)oRow[self:_recnoColumNo] = nRec
SELF:RowNumber := rowIndex
SELF:_SetEOF(FALSE)
SELF:_SetBOF(FALSE)
SELF:_Found := TRUE
RETURN TRUE
return true
endif
NEXT
rowIndex++
next

SELF:_GotoRecord(nRec)
SELF:_CheckEofBof()
RETURN TRUE
Expand All @@ -700,7 +712,7 @@ partial class SQLRDD inherit Workarea
return (DWORD) SELF:RowNumber
endif
var row := SELF:CurrentRow
if ! SELF:EoF .and. row != null
if ! SELF:_EoF .and. row != null
var obj := row[self:_recnoColumNo]
return Convert.ToUInt32(obj)
endif
Expand Down Expand Up @@ -825,6 +837,10 @@ partial class SQLRDD inherit Workarea
RETURN SUPER:SetFilter(info)
end method

public override method Flush() as logic
RETURN SELF:GoCold()
end method

#region Lock / Unlock

public override method Lock(lockInfo ref DbLockInfo) as logic
Expand Down Expand Up @@ -917,6 +933,11 @@ partial class SQLRDD inherit Workarea
return false
end try

// In ADS this happens in here: ACE.AdsUnlockRecord(SELF:_Table, dwRecno)
if (self:Deleted)
self:_ExecuteDeleteStatement(CurrentRow)
endif

return true
end method

Expand Down
19 changes: 12 additions & 7 deletions src/Runtime/XSharp.SQLRdd/RDD/SQLRDD-Private.prg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ partial class SQLRDD
private _emptyValues as object[]
private _updatableColumns as List<RddFieldInfo>
private _keyColumns as List<RddFieldInfo>
private _updatedRows as List<DataRow>
private _updatedRowIds as List<int>
private _orderBagList as List<SqlDbOrderBag>
private _rowNumber as long
private _rowNumber as long

/// <summary>
/// 0 based Column Number for the column that has the deleted flag
Expand Down Expand Up @@ -127,7 +127,7 @@ partial class SQLRDD
SELF:_currentPageNo := 1
SELF:_firstPageNo := 1
self:_trimValues := true // trim String Valuess
SELF:_updatedRows := List<DataRow>{}
SELF:_updatedRowIds := List<int>{}
SELF:_keyColumns := List<RddFieldInfo>{}
SELF:_updatableColumns := List<RddFieldInfo>{}
SELF:_orderBagList := List<SqlDbOrderBag>{}
Expand All @@ -136,7 +136,8 @@ partial class SQLRDD
end constructor

destructor()
Command:Close()
Command:Dispose()
_connection:Dispose()
end destructor

internal method _ClearTable() AS VOID
Expand Down Expand Up @@ -365,7 +366,7 @@ partial class SQLRDD
_command:AddParameter(name, row[c])
++iCounter
next
if ! lColumnChanged
if !lColumnChanged .and. !self:_oTd:UpdateAllColumns
// no columns changed, so we do not update this row
return TRUE
endif
Expand Down Expand Up @@ -410,6 +411,7 @@ partial class SQLRDD
end method

private method _ExecuteDeleteStatement(row as DataRow) as logic
// TODO: check config if logic or physical delete
_command:ClearParameters()
var strWhere := SELF:_GetWhereClause(row)
var sb := StringBuilder{}
Expand Down Expand Up @@ -580,7 +582,10 @@ partial class SQLRDD
SELF:RowNumber := SELF:DataTable:Rows:Count + 1

foreach row as DataRow in newTable:Rows
SELF:DataTable:Rows:Add(row:ItemArray)
var newRow := SELF:DataTable:NewRow()
newRow:ItemArray := row:ItemArray
SELF:DataTable:Rows:Add(newRow)
newRow:AcceptChanges()
next
else
SELF:RowNumber := newTable:Rows:Count
Expand All @@ -590,6 +595,7 @@ partial class SQLRDD
var newRow := SELF:DataTable:NewRow()
newRow:ItemArray := row:ItemArray
SELF:DataTable:Rows:InsertAt(newRow, 0)
newRow:AcceptChanges()
next
endif
if lForward .and. newTable:Rows:Count < _oTd:PageSize
Expand All @@ -601,7 +607,6 @@ partial class SQLRDD
return result

PRIVATE METHOD _GotoRecord(nRec as DWORD) AS LOGIC

if SELF:DataTable:Rows:Count < 1
// Brute walk
SELF:_command:CommandText := _builder:BuildRowNumberStatement(nRec)
Expand Down
Loading