diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index b1b8440d8..2ad2fe814 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -165,6 +165,13 @@
               android:readPermission="com.todoroo.astrid.READ"
               android:writePermission="com.todoroo.astrid.WRITE"/>
 
+    <provider android:name="com.todoroo.astrid.provider.SqlContentProvider"
+              android:authorities="com.todoroo.astrid.private"
+              android:multiprocess="true"
+              android:grantUriPermissions="true"
+              android:readPermission="com.todoroo.astrid.READ"
+              android:writePermission="com.todoroo.astrid.WRITE"/>
+
     <!-- ========================================================= Plugins = -->
         
     <!-- core -->
diff --git a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
new file mode 100644
index 000000000..b9500e3d2
--- /dev/null
+++ b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java
@@ -0,0 +1,135 @@
+/**
+ * See the file "LICENSE" for the full license governing this code.
+ */
+package com.todoroo.astrid.provider;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+
+import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.service.ExceptionService;
+import com.todoroo.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.dao.Database;
+import com.todoroo.astrid.service.AstridDependencyInjector;
+
+/**
+ * Non-public-API SQL content provider.
+ *
+ * This provider is dangerous and unsupported, use at your own risk. It allows
+ * full SQL queries, which means LIMIT and JOIN in queries. Only SELECT is
+ * currently supported.
+ *
+ * @author Tim Su <tim@todoroo.com>
+ *
+ */
+@SuppressWarnings("nls")
+public class SqlContentProvider extends ContentProvider {
+
+    static {
+        AstridDependencyInjector.initialize();
+    }
+
+    // --- instance variables
+
+    private static UriMatcher uriMatcher;
+
+    @Autowired
+    private Database database;
+
+    @Autowired
+    private ExceptionService exceptionService;
+
+    @Override
+    public boolean onCreate() {
+        try {
+            database.openForWriting();
+            return database.getDatabase() != null;
+        } catch (Exception e) {
+            exceptionService.reportError("astrid-provider", e);
+            return false;
+        }
+    }
+
+    static {
+        uriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+
+        uriMatcher.addURI(AstridApiConstants.PACKAGE + ".private",
+                "sql", 0);
+    }
+
+    public SqlContentProvider() {
+        DependencyInjectionService.getInstance().inject(this);
+
+        setReadPermission(AstridApiConstants.PERMISSION_READ);
+        setWritePermission(AstridApiConstants.PERMISSION_WRITE);
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        switch (uriMatcher.match(uri)) {
+        case 0:
+            return "vnd.android.cursor.dir/vnd.astrid";
+        default:
+            throw new IllegalArgumentException("Unsupported URI " + uri + " (" + uriMatcher.match(uri) + ")");
+        }
+    }
+
+    /* ======================================================================
+     * =========================================================== delete ===
+     * ====================================================================== */
+
+    /**
+     * Delete from given table
+     * @return number of rows deleted
+     */
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("unimplemented");
+    }
+
+    /* ======================================================================
+     * =========================================================== insert ===
+     * ====================================================================== */
+
+    /**
+     * Insert key/value pairs into given table
+     */
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException("unimplemented");
+    }
+
+    /* ======================================================================
+     * =========================================================== update ===
+     * ====================================================================== */
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+            String[] selectionArgs) {
+        throw new UnsupportedOperationException("unimplemented");
+    }
+
+    /* ======================================================================
+     * ============================================================ query ===
+     * ====================================================================== */
+
+    /**
+     * Query by task.
+     * <p>
+     * Note that the "sortOrder" field actually can be used to append any
+     * sort of clause to your SQL query as long as it is not also the
+     * name of a column
+     */
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+
+        Cursor cursor = database.rawQuery(selection, null);
+        return cursor;
+    }
+
+}