Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
47fb455
Migrated to XCTest
Dec 9, 2015
b6c8bfa
Updates for Xcode 7.
shadyoak Dec 21, 2015
ac3dd32
Fixed "multiple build command" warnings.
shadyoak Jan 4, 2016
c3676fb
added groupby
Mar 1, 2016
fb5893d
Added raw sql queries
Mar 7, 2016
db80d52
Added main queue
Mar 7, 2016
d3bc0e1
Removed operation block from mars
Mar 14, 2016
1e892af
Fixed issue with errors being set when no errors happened.
Mar 14, 2016
bd403de
Fixed error
Mar 14, 2016
6e1c9b9
logging
Apr 10, 2016
a0ad969
added trace logging for failed statements
Apr 10, 2016
fbba452
Add log statement to trace
Apr 11, 2016
9ee61c0
Removed sql trace logging
Apr 14, 2016
c8b881d
Create LICENSE
mronge Apr 18, 2016
05dd5c9
Merge pull request #1 from mronge/patch-1
Apr 18, 2016
bc65b33
Removed raw query warning
Apr 28, 2016
d167553
Merge branch 'develop'
Apr 28, 2016
d9b74a6
Added temp executeRawQuery
Apr 28, 2016
64802c2
Added support for a raw where clause on SELECT queries.
shadyoak May 23, 2016
1b3287f
Merge pull request #2 from virtru/develop
May 23, 2016
c01ba08
Fixed issue where the join was not getting appended when using a raw …
shadyoak May 24, 2016
0e4b6d4
Merge pull request #3 from virtru/develop
May 24, 2016
be1cd6e
Updated minimum version to 9.0 and accepted recommended settings.
Sep 15, 2016
0c1e707
Merge pull request #4 from virtru/develop
shadyoak Oct 18, 2016
a39db9d
Modification for [IOS-1005] allow queries to complete on a background…
shadyoak Jan 31, 2017
be758bf
Merge pull request #5 from virtru/develop
jostster Feb 2, 2017
4203879
Improved raw query per todo comment :)
Mar 1, 2017
ecb936a
Merge pull request #6 from virtru/develop
jostster Mar 1, 2017
557841c
+ Fix the CTLog to print the local time stamp.
sujankota Feb 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
Mars

Copyright (C) 2013 Matt Ronge
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. Neither the name of the Mars project nor the names of its
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
SUCH DAMAGE.
136 changes: 82 additions & 54 deletions Mars/Mars.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Mars/Mars/MConnection.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
- (BOOL)exec:(NSString *)sql error:(NSError **)error;
- (int64_t)executeUpdate:(MQuery *)query error:(NSError **)error;
- (NSArray *)executeQuery:(MQuery *)query error:(NSError **)error;
- (id)executeRawQuery:(NSString *)rawQuery error:(NSError **)error;
- (BOOL)beginTransaction:(NSError **)error;
- (BOOL)commit:(NSError **)error;
- (BOOL)rollback:(NSError **)error;
Expand Down
Loading