From ec60a32215bb07f5ccd9b8061a88112985acaf8b Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 14 Oct 2015 16:06:51 +0200 Subject: Add mysql:// URL handler (fixes #1681) --- Resources/Plists/Info.plist | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Resources') diff --git a/Resources/Plists/Info.plist b/Resources/Plists/Info.plist index 2ba52aa3..a0b1401b 100644 --- a/Resources/Plists/Info.plist +++ b/Resources/Plists/Info.plist @@ -173,6 +173,14 @@ sequelpro + + CFBundleURLName + MySQL URL scheme + CFBundleURLSchemes + + mysql + + CFBundleVersion -- cgit v1.2.3 From c7b56fe8818ea02de033193318c544eea5abf024 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 15 Nov 2015 02:48:51 +0100 Subject: * Add QuickLook support for "export settings" files * Add MGTemplateEngine to the QL plugin * Reorder the generator code a bit, so it's not one monolithic function * Add constants for some other sfp format types --- .../SPQLPluginExportSettingsTemplate.html | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 Resources/English.lproj/SPQLPluginExportSettingsTemplate.html (limited to 'Resources') diff --git a/Resources/English.lproj/SPQLPluginExportSettingsTemplate.html b/Resources/English.lproj/SPQLPluginExportSettingsTemplate.html new file mode 100644 index 00000000..29a2e9d7 --- /dev/null +++ b/Resources/English.lproj/SPQLPluginExportSettingsTemplate.html @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + +

+ + Sequel Pro Saved Export Settings
+ {{ filename }} +

+

+ + + + + {% if customFilename %} + + + + + {% /if %} + + + + + + + + + + + + + + + +

Path:	{{ exportPath }}
Filename:	{{ part.name }}{{ part.name }}
Format:	{{ exportType }}
Compression:	{{ compressionFormat }}
Input data:	{{ exportSource }}
Low Memory:
(format specific settings not shown)

+ + + -- cgit v1.2.3 From a23e7b66395357ada37a1e6a8c386ce49b58a611 Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 15 Nov 2015 18:08:40 +0100 Subject: Store the last export settings using the new "export settings" format --- Resources/Plists/PreferenceDefaults.plist | 4 ---- 1 file changed, 4 deletions(-) (limited to 'Resources') diff --git a/Resources/Plists/PreferenceDefaults.plist b/Resources/Plists/PreferenceDefaults.plist index 687b4b09..1d55e65a 100644 --- a/Resources/Plists/PreferenceDefaults.plist +++ b/Resources/Plists/PreferenceDefaults.plist @@ -149,8 +149,6 @@ 3 NewFieldsAllowNulls - NoBOMforSQLdumpFile - NullValue NULL PrintBackground @@ -189,8 +187,6 @@ SPFirstRun - SQLExportUseCompression - SSHMultiplexingEnabled TableInformationPanelCollapsed -- cgit v1.2.3 From 1f7684a8d075a77914301aea444e2a244347249d Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 15 Nov 2015 21:17:36 +0100 Subject: Add basic support for JSON type (part of #2199) --- Resources/Plists/CompletionTokens.plist | 64 +++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) (limited to 'Resources') diff --git a/Resources/Plists/CompletionTokens.plist b/Resources/Plists/CompletionTokens.plist index f089401d..fc10db70 100644 --- a/Resources/Plists/CompletionTokens.plist +++ b/Resources/Plists/CompletionTokens.plist @@ -289,6 +289,7 @@ ISSUER ITERATE JOIN + JSON KEY KEYS KEY_BLOCK_SIZE @@ -834,6 +835,27 @@ ISSIMPLE IS_FREE_LOCK IS_USED_LOCK + JSON_APPEND + JSON_ARRAY_APPEND + JSON_ARRAY_INSERT + JSON_ARRAY + JSON_CONTAINS_PATH + JSON_CONTAINS + JSON_DEPTH + JSON_EXTRACT + JSON_INSERT + JSON_KEYS + JSON_LENGTH + JSON_MERGE + JSON_OBJECT + JSON_QUOTE + JSON_REMOVE + JSON_REPLACE + JSON_SEARCH + JSON_SET + JSON_TYPE + JSON_UNQUOTE + JSON_VALID LAST_DAY LAST_INSERT_ID LCASE @@ -1162,6 +1184,48 @@ ${1:bits}, ${2:str1} FIND_IN_SET ${1:str}, ${2:strlist} + JSON_APPEND + ${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}} + JSON_ARRAY_APPEND + ${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}} + JSON_ARRAY_INSERT + ${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}} + JSON_ARRAY + ${1:${2:val} ${3:, ${4:val}${5:, ${6:...}}}} + JSON_CONTAINS_PATH + ${1:json_doc}, ${2:¦'one'¦'all'¦}, ${3:path}${4:, ${5:path}${6:, ${7:...}}} + JSON_CONTAINS + ${1:json_doc}, ${2:val}${3:, ${4:path}} + JSON_DEPTH + ${1:json_doc} + JSON_EXTRACT + ${1:json_doc}, ${2:path}${3:, ${4:path}${5:, ${6:...}}} + JSON_INSERT + ${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}} + JSON_KEYS + ${1:json_doc}${2:, ${3:path}} + JSON_LENGTH + ${1:json_doc}${2:, ${3:path}} + JSON_MERGE + ${1:json_doc}, ${2:json_doc}${3:, ${4:...}} + JSON_OBJECT + ${1:${2:key}, ${3:val}${4:, ${5:key}, ${6:val}${7:, ${8:...}}}} + JSON_QUOTE + ${1:json_val} + JSON_REMOVE + ${1:json_doc}, ${2:path}${3:, ${4:path}${5:, ${6:...}}} + JSON_REPLACE + ${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}} + JSON_SEARCH + ${1:json_doc}, ${2:¦'one'¦'all'¦}, ${3:search_str}${4:, ${5:escape_char}${6:, ${7:path${8:, ${9:...}}}}} + JSON_SET + ${1:json_doc}, ${2:path}, ${3:val}${4:, ${5:path}, ${6:val}${7:, ${8:...}}} + JSON_TYPE + ${1:json_val} + JSON_UNQUOTE + ${1:val} + JSON_VALID + ${1:val} -- cgit v1.2.3 From a9dd68e95cc15ad0370998d0769f2110871f322c Mon Sep 17 00:00:00 2001 From: Steve Robbins Date: Sat, 9 Jan 2016 23:07:17 -0800 Subject: Yay, 2016. --- Resources/License.rtf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Resources') diff --git a/Resources/License.rtf b/Resources/License.rtf index a9ce83c0..5f5e1c22 100644 --- a/Resources/License.rtf +++ b/Resources/License.rtf @@ -5,7 +5,7 @@ \deftab560 \pard\tx560\pardeftab560\pardirnatural -\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2015 Sequel Pro & CocoaMySQL Teams. \ +\f0\b\fs22 \cf2 \CocoaLigature0 Copyright (c) 2002-2016 Sequel Pro & CocoaMySQL Teams. \ \ All rights reserved. \b0 \ @@ -34,4 +34,4 @@ CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN \ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER \ DEALINGS IN THE SOFTWARE. \b0 \cf0 \CocoaLigature1 \ -} \ No newline at end of file +} -- cgit v1.2.3 From a739b2b2c8d576aa92f6e66eafea06d660af5763 Mon Sep 17 00:00:00 2001 From: Max Date: Wed, 13 Jan 2016 18:12:13 +0100 Subject: More 2016 --- Resources/English.lproj/InfoPlist.strings | 4 ++-- Resources/Plists/Info.plist | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'Resources') diff --git a/Resources/English.lproj/InfoPlist.strings b/Resources/English.lproj/InfoPlist.strings index af866cf8..64644f83 100644 --- a/Resources/English.lproj/InfoPlist.strings +++ b/Resources/English.lproj/InfoPlist.strings @@ -1,4 +1,4 @@ /* Localized versions of Info.plist keys */ -CFBundleGetInfoString = "Sequel Pro version 1.0.2, Copyright 2002-2013 Sequel Pro and CocoaMySQL team."; -NSHumanReadableCopyright = "Copyright 2002-2013 Sequel Pro and CocoaMySQL team."; \ No newline at end of file +CFBundleGetInfoString = "Sequel Pro version 1.1, Copyright 2002-2016 Sequel Pro and CocoaMySQL team."; +NSHumanReadableCopyright = "Copyright 2002-2016 Sequel Pro and CocoaMySQL team."; \ No newline at end of file diff --git a/Resources/Plists/Info.plist b/Resources/Plists/Info.plist index a0b1401b..c4a82db9 100644 --- a/Resources/Plists/Info.plist +++ b/Resources/Plists/Info.plist @@ -202,7 +202,7 @@ NSAppleScriptEnabled NSHumanReadableCopyright - Copyright 2002-2015 Sequel Pro and CocoaMySQL team. + Copyright 2002-2016 Sequel Pro and CocoaMySQL team. NSMainNibFile MainMenu NSPrincipalClass -- cgit v1.2.3