- Improve error checking for various actions, particularly permissions errors (NULL data returned) for views and stored procedures. This should fix http://log.sequelpro.com/view/27 , http://log.sequelpro.com/view/57 , and the last of http://log.sequelpro.com/view/53

1 files changed, 22 insertions, 0 deletions

diff --git a/Source/TableDocument.m b/Source/TableDocument.m
index 936792b2..4ef781e3 100644
--- a/Source/TableDocument.m
+++ b/Source/TableDocument.m
@@ -1672,6 +1672,17 @@
 
 	NSString *tableSyntax = [[theResult fetchRowAsArray] objectAtIndex:colOffs];
 
+	// A NULL value indicates that the user does not have permission to view the syntax
+	if ([tableSyntax isNSNull]) {
+		[[NSAlert alertWithMessageText:NSLocalizedString(@"Permission Denied", @"Permission Denied")
+						 defaultButton:NSLocalizedString(@"OK", @"OK")
+					   alternateButton:nil otherButton:nil
+			 informativeTextWithFormat:NSLocalizedString(@"The creation syntax could not be retrieved due to a permissions error.\n\nPlease check your user permissions with an administrator.", @"Create syntax permission denied detail")]
+			  beginSheetModalForWindow:tableWindow
+						 modalDelegate:self didEndSelector:NULL contextInfo:NULL];
+		return;
+	}
+
 	[createTableSyntaxTextField setStringValue:[NSString stringWithFormat:@"Create syntax for %@ '%@'", typeString, [self table]]];
 
 	[createTableSyntaxTextView setEditable:YES];
@@ -1730,6 +1741,17 @@
 
 	NSString *tableSyntax = [[theResult fetchRowAsArray] objectAtIndex:colOffs];
 
+	// A NULL value indicates that the user does not have permission to view the syntax
+	if ([tableSyntax isNSNull]) {
+		[[NSAlert alertWithMessageText:NSLocalizedString(@"Permission Denied", @"Permission Denied")
+						 defaultButton:NSLocalizedString(@"OK", @"OK")
+					   alternateButton:nil otherButton:nil
+			 informativeTextWithFormat:NSLocalizedString(@"The creation syntax could not be retrieved due to a permissions error.\n\nPlease check your user permissions with an administrator.", @"Create syntax permission denied detail")]
+			  beginSheetModalForWindow:tableWindow
+						 modalDelegate:self didEndSelector:NULL contextInfo:NULL];
+		return;
+	}
+
 	// copy to the clipboard
 	NSPasteboard *pb = [NSPasteboard generalPasteboard];
 	[pb declareTypes:[NSArray arrayWithObject:NSStringPboardType] owner:self];