Merge branch 'release/1.1.0'

Author: revig

README.md

@@ -86,7 +86,7 @@ For the license terms see the LICENSE file.
 
 ### Meta
 
-Version: 1.0.2  
+Version: 1.1.0  
 Web Site: <https://revigniter.com/>  
 
 Author:  Ralf Bitter

SQLiteLib.livecodescript

@@ -8,7 +8,7 @@ script "SQLiteLib"
 --
 -- ©2019 revIgniter.com
 --
--- Version 1.0.2
+-- Version 1.1.0
 --
 -- License: Apache 2.0
 --
@@ -1706,22 +1706,22 @@ end rigDbFieldData
 --| FUNCTION rigDbInsertString
 --|
 --| Author: rabit
---| Version:  1.1
---| Created: 01-10-09
---| Last Mod: 14-10-09
+--| Version:  1.2
+--| Created: 2009-10-01
+--| Last Mod: 2019-08-08
 --| Requires: _rigEscapeIdentifiers(), rigDbEscape(), _rigProtectIdentifiers(), _rigInsert()
 --|
 --| Summary: Generate an insert string.
 --| 
---| Format:  rigDbInsertString(param1, param2)
+--| Format:  rigDbInsertString(param1, param2[, param3])
 --|
 --| Parameters: string <pTable> the table upon which the query will be performed,
---|                       array <pData> an associative array data of key/values
+--|                       array <pData> an associative array data of key/values, bool <pReplace> (optional)
 --|
 --| Return: string
 ----------------------------------------------------------------------*/
 
-function rigDbInsertString pTable pData
+function rigDbInsertString pTable pData pReplace
    local tCounter, tVal, tFields, tValues, tTable
 
    put 0 into tCounter
@@ -1735,7 +1735,7 @@ function rigDbInsertString pTable pData
 
    put _rigProtectIdentifiers(pTable, TRUE, NULL, FALSE) into tTable
 
-   return _rigInsert(tTable, tFields, tValues)
+   return _rigInsert(tTable, tFields, tValues, pReplace)
 end rigDbInsertString
 
 
@@ -2840,25 +2840,30 @@ end _rigFromTables
 --| FUNCTION _rigInsert
 --|
 --| Author: rabit
---| Version:  1.0
---| Created: 11-04-14
---| Last Mod: --
+--| Version:  1.1
+--| Created: 2014-04-11
+--| Last Mod: 2019-08-08
 --| Requires: --
 --|
 --| Summary: Generates a platform-specific insert string from the supplied data.
 --| 
---| Format:  _rigInsert(param1, param2, param3)
+--| Format:  _rigInsert(param1, param2, param3[, param4])
 --|
---| Parameters: string <pTable> the table name, array <pKeys> the insert keys, array <pValues> the insert values
+--| Parameters: string <pTable> the table name, array <pKeys> the insert keys,
+--|               array <pValues> the insert values, bool <pReplace> (optional)
 --|
 --| Return: string
 ----------------------------------------------------------------------*/
 
-private function _rigInsert pTable pKeys pValues
+private function _rigInsert pTable pKeys pValues pReplace
 	combine pKeys using comma
 	combine pValues using comma
 
-	return "INSERT INTO " & pTable & " (" & pKeys & ") VALUES (" & pValues & ")"
+	if pReplace <> TRUE then
+		return "INSERT INTO " & pTable & " (" & pKeys & ") VALUES (" & pValues & ")"
+	else
+		return "INSERT OR REPLACE INTO " & pTable & " (" & pKeys & ") VALUES (" & pValues & ")"
+	end if
 end _rigInsert
 
 
@@ -6372,24 +6377,25 @@ end rigDbGetWhere
 --| FUNCTION rigDbInsert
 --|
 --| Author: rabit
---| Version:  1.0
---| Created: 22-04-14
---| Last Mod: --
+--| Version:  1.1
+--| Created: 2014-04-22
+--| Last Mod: 2019-08-08
 --| Requires: rigDbValuesSet(), dbErrorHandling, _rigProtectIdentifiers(), rigArrayKeys()
 --|            rigArrayValues(), _rigInsert(), _rigResetWrite, rigDbQuery(), _rigDbLastInsertID()
 --|
 --| Summary: Compiles an insert string and runs the query.
 --| 
---| Format:  rigDbInsert(param1, param2, param3)
+--| Format:  rigDbInsert(param1, param2[, param3][, param4])
 --|
 --| Parameters: string <pTable> the table to retrieve the results from, array <pInsertVals>
 --| 			      an associative array of insert values, bool <pLastInsertID> flag which determines
---| 			      if the last automatically generated ID value of an AUTO_INCREMENT column should be returned
+--| 			      if the last automatically generated ID value of an AUTO_INCREMENT column should be returned (optional),
+--|             bool <pReplace> (optional)
 --|
 --| Return: mixed
 ----------------------------------------------------------------------*/
 
-function rigDbInsert pTable pInsertVals pLastInsertID
+function rigDbInsert pTable pInsertVals pLastInsertID pReplace
    local tInsertVals, tLastInsertID, tTable, tArrayKeys, tArrayValues, tSQL, tResultVal
 
    if pInsertVals is an array then
@@ -6431,7 +6437,7 @@ function rigDbInsert pTable pInsertVals pLastInsertID
    put rigArrayKeys(sActiveRecord["set"]) into tArrayKeys
    put rigArrayValues(sActiveRecord["set"], FALSE) into tArrayValues -- use apostrophes (false) is already done by rigDbValuesSet(pInsertVals)
 
-   put _rigInsert(tTable, tArrayKeys, tArrayValues) into tSQL
+   put _rigInsert(tTable, tArrayKeys, tArrayValues, pReplace) into tSQL
 
    _rigResetWrite
 
@@ -6450,6 +6456,61 @@ end rigDbInsert
 
 
 
+/*----------------------------------------------------------------------
+--| COMMAND rigDBinsertQueryArray
+--|
+--| Author: rabit
+--| Version:  1.0
+--| Created: 2019-08-08
+--| Last Mod: --
+--| Requires: rigDbInsert(), dbErrorHandling
+--|
+--| Summary: Insert data returned by a database query.
+--| 
+--| Format:  rigDBinsertQueryArray param1, param2[, param3]
+--|
+--| Parameters: string <pTableName>, array <pTableA> the array returned by a query, bool <pReplace> (optional)
+--|
+--| Return: empty
+----------------------------------------------------------------------*/
+
+command rigDBinsertQueryArray pTableName pTableA pReplace
+	local tTableKeys, tFieldNamesA, tNumFields
+	local tKey, tRowA, tFieldNum, tDataA
+
+	if pTableA is an array then
+
+		if pTableA["numrows"] > 0 then
+			put the keys of pTableA["resultarray"] into tTableKeys
+			sort lines of tTableKeys ascending numeric
+
+			put pTableA["fieldnames"] into tFieldNamesA
+			put the number of lines in the keys of tFieldNamesA into tNumFields
+
+			-- repeat for each key tKey in pTableA["resultarray"]
+			repeat for each line tKey in tTableKeys
+
+				put pTableA["resultarray"][tKey] into tRowA
+
+				repeat with tFieldNum = 1 to tNumFields 
+					put tRowA[tFieldNum] into tDataA[tFieldNamesA[tFieldNum]]
+				end repeat
+
+				get rigDbInsert(pTableName, tDataA, , pReplace)
+				if it is FALSE then
+					dbErrorHandling "Insertion failed!"
+				end if
+			end repeat
+		end if -- if pTableA["numrows"] > 0
+	end if -- if pTableA is an array
+end rigDBinsertQueryArray
+
+
+
+
+
+
+
 /*----------------------------------------------------------------------
 --| FUNCTION rigDbUpdate
 --|