From 44863b6274682cb2c6e92da1f728519dde72bbac Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 17 Jun 2016 20:23:56 +0000
Subject: [PATCH] tvplanit: Fixing exceptions related to combinations of
 AutoCreate and AutoConnect for ZeosDatastore (still crashing in case of
 AutoCreate=false and Autoconnect=true at first access to data).

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4762 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/tvplanit/source/vpzeosds.pas | 31 +++++++++++++++----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/components/tvplanit/source/vpzeosds.pas b/components/tvplanit/source/vpzeosds.pas
index 17ec55b4f..6f79f3c39 100644
--- a/components/tvplanit/source/vpzeosds.pas
+++ b/components/tvplanit/source/vpzeosds.pas
@@ -19,9 +19,9 @@ type
 
   protected
     procedure CreateTable(const ATableName: String);
+    procedure CreateAllTables;
     function GetContactsTable: TDataset; override;
     function GetEventsTable: TDataset; override;
-    function GetNextID(TableName: string): int64; override;
     function GetResourceTable: TDataset; override;
     function GetTasksTable: TDataset; override;
     procedure Loaded; override;
@@ -31,6 +31,7 @@ type
   public
     constructor Create(AOwner: TComponent); override;
     procedure CreateTables;
+    function GetNextID(TableName: string): int64; override;
 
     property ResourceTable;
     property EventsTable;
@@ -72,19 +73,12 @@ begin
   FTasksTable.TableName := 'Tasks';
 end;
 
-// Connection and tables are active afterwards!
-procedure TVpZeosDatastore.CreateTables;
+procedure TVpZeosDatastore.CreateAllTables;
 begin
-  FConnection.Connected := true;
   if not FContactsTable.Exists then CreateTable(ContactsTableName);
   if not FEventsTable.Exists then CreateTable(EventsTableName);
   if not FResourceTable.Exists then CreateTable(ResourceTableName);
   if not FTasksTable.Exists then CreateTable(TasksTableName);
-
-  ContactsTable.Open;
-  EventsTable.Open;
-  ResourceTable.Open;
-  TasksTable.Open;
 end;
 
 procedure TVpZeosDatastore.CreateTable(const ATableName: String);
@@ -241,6 +235,16 @@ begin
   end;
 end;
 
+procedure TVpZeosDatastore.CreateTables;
+var
+  wasConnected: Boolean;
+begin
+  wasConnected := FConnection.Connected;
+  FConnection.Connected := true;
+  CreateAllTables;
+  SetConnected(wasConnected or AutoConnect);
+end;
+
 function TVpZeosDatastore.GetContactsTable: TDataset;
 begin
   Result := FContactsTable;
@@ -272,7 +276,10 @@ procedure TVpZeosDatastore.Loaded;
 begin
   inherited;
   if not (csDesigning in ComponentState) then
-    Connected := AutoConnect;
+    Connected := AutoConnect and (
+      AutoCreate or
+      (FContactsTable.Exists and FEventsTable.Exists and FResourceTable.Exists and FTasksTable.Exists)
+    );
 end;
 
 procedure TVpZeosDatastore.Notification(AComponent: TComponent;
@@ -285,14 +292,14 @@ end;
 
 procedure TVpZeosDatastore.SetConnected(const AValue: Boolean);
 begin
-  if AValue = Connected then
+  if {(AValue = Connected) or }(FConnection = nil) then
     exit;
 
   if AValue and AutoCreate then
     CreateTables;
 
   FConnection.Connected := AValue;
-  if AValue then begin
+  if FConnection.Connected then begin
     FContactsTable.Open;
     FEventsTable.Open;
     FResourceTable.Open;