Code cleanup

Cleaned up code and switched on of the Connect calls to use API 2.0.

Author: paullefebvre

Storm.xojo_code

@@ -31,10 +31,13 @@ Protected Module Storm
 		- Fixed a possible SQL Injection
 		- Added SerializeJSON Method
 		- Added DBObject.kUseNilValues Constant to initialize columns with Nil values instead of an empty string
+		
+		== v1.2.1 == 2025-02-05
+		- Minor code cleanup.
 	#tag EndNote
 
 	#tag Note, Name = Storm License
-		Copyright (c) 2014, Paul Lefebvre
+		Copyright (c) 2014-2025, Paul Lefebvre
 		All rights reserved.
 
 		Redistribution and use in source and binary forms, with or without
@@ -63,7 +66,7 @@ Protected Module Storm
 	#tag EndNote
 
 
-	#tag Constant, Name = kStormVersion, Type = String, Dynamic = False, Default = \"1.2.0", Scope = Private
+	#tag Constant, Name = kStormVersion, Type = String, Dynamic = False, Default = \"1.2.1", Scope = Private
 	#tag EndConstant
 
 

Storm.xojo_project

@@ -1,5 +1,5 @@
 Type=Desktop
-RBProjectVersion=2024.011
+RBProjectVersion=2024.042
 MinIDEVersion=20210300
 OrigIDEVersion=00000000
 Class=App;App.xojo_code;&h0000000071109B85;&h0000000000000000;false

Storm/DBConnection.xojo_code

@@ -41,11 +41,12 @@ Protected Class DBConnection
 		      mIsConnected = False
 		    End Try
 		  Else
-		    If mDatabase.Connect Then
+		    Try
+		      mDatabase.Connect
 		      mIsConnected = True
-		    Else
+		    Catch e As DatabaseException
 		      mIsConnected = False
-		    End If
+		    End Try
 		  End If
 
 		  If mIsConnected Then

Storm/DBObject.xojo_code

@@ -176,7 +176,7 @@ Protected Class DBObject
 		    Var query As String = "SELECT * FROM " + TableName + " WHERE " + column + " = ?" '+ SqlValue(value)
 
 		    Var values() as Variant
-		    values.Add value
+		    values.Add(value)
 
 		    Var row As RowSet
 		    row = mDatabaseConnection.SQLSelect(query, values)
@@ -394,7 +394,6 @@ Protected Class DBObject
 		  Var primaryKeyValue As Int64
 		  Var serverIDValue As String
 
-		  Var tsNode As XmlNode
 		  For i As Integer = 0 To LastRowIndex
 
 		    Dim child As JSONItem
@@ -710,14 +709,11 @@ Protected Class DBObject
 		    For Each colName As Variant In mColumn.Keys
 		      If colName <> PrimaryKey Or mPrimaryKeyIsString Or UsePrimaryKeyValue Then
 		        If colName = TimeStamp Then
-		          Values.Add now.SQLDateTime
+		          Values.Add(now.SQLDateTime)
 		          command = command + comma + "?"
-		          'command = command + comma + Now.SQLDateTime.Quote
 		        Else
-		          Values.Add mColumn.Value(colName)
+		          Values.Add(mColumn.Value(colName))
 		          command = command + comma + "?"
-		          
-		          'command = command + comma + sqlValue(mColumn.Value(colName))
 		        End If
 
 		        comma = ","
@@ -732,11 +728,10 @@ Protected Class DBObject
 		    For Each colName As Variant In mColumn.Keys
 		      If colName <> PrimaryKey And colName <> "serverID" Then
 		        If colName = TimeStamp Then
-		          values.Add now.SQLDateTime
+		          values.Add(now.SQLDateTime)
 		          command = command + comma + colName + " = ?"
-		          'command = command + comma + colName + " = " + Now.SQLDateTime.Quote
 		        Else
-		          values.Add mColumn.Value(colName)
+		          values.Add(mColumn.Value(colName))
 		          command = command + comma + colName + " = ?"
 		        End If
 
@@ -748,8 +743,6 @@ Protected Class DBObject
 
 		  End If
 
-		  
-		  
 		  If mDatabaseConnection.SQLExecute(command, values) Then
 		    mIsDirty = False
 
@@ -951,17 +944,14 @@ Protected Class DBObject
 
 		  Var js As new JSONItem
 
-		  Var children() as JSONItem
-		  
 		  Try
 		    For Each o As Storm.DBObject In objects
-		      js.Add o.SerializeJSON()
+		      js.Add(o.SerializeJSON())
 		    Next
 		  Catch e As RuntimeException
 		    MessageBox(e.Message)
 		  End Try
 
-		  
 		  Return js
 		End Function
 	#tag EndMethod