Merge branch 'master' into definable_foreign_key_names

* master: Update .travis.yml Update README.md Update .travis.yml AlexDenisov#64 changed toColumnType of the NSDateColumn to return NSDate instances instead of NSNumber values with the time interval
jklimke · Feb 10, 2014 · 4220c79 · 4220c79
2 parents 19e1e74 + 21e5c82
commit 4220c79
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,9 @@
 language: objective-c
 
 before_install:
-    - sudo gem update --system
-    - sudo gem install ios_ci
-    - sudo gem update cocoapods
+    - gem update --system
+    - gem install ios_ci
+    - gem install cocoapods
     - brew install ios-sim
 
 script: ios_ci cedar --source-root $TRAVIS_BUILD_DIR --workspace iActiveRecord.xcworkspace --scheme UnitTests --build-path build/Products

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-_Note: I'm working on new version, with new features and a bugfixes_
+_discontinued_
 
 ## ActiveRecord without CoreData.
 ### Only SQLite.

diff --git a/iActiveRecord/Classes/Core/Columns/ConcreteColumns/NSDateColumn.mm b/iActiveRecord/Classes/Core/Columns/ConcreteColumns/NSDateColumn.mm
@@ -25,7 +25,7 @@
 
     NSDate *__strong NSDateColumn::toColumnType(id value) const
     {
-        return value;
+        return [NSDate dateWithTimeIntervalSince1970: [value doubleValue]];
     }
 
     id NSDateColumn::toObjCObject(NSDate *value) const