@@ -29,16 +29,16 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
2929 }
3030
3131 override fun onCreate (db : SQLiteDatabase ) {
32- db.execSQL(" CREATE TABLE ${ TABLE_NAME } (${ COL_ID } INTEGER PRIMARY KEY, ${ COL_TITLE } TEXT UNIQUE, ${ COL_VALUE } TEXT, ${ COL_TYPE } INTEGER DEFAULT 0, ${ COL_PATH } TEXT)" )
32+ db.execSQL(" CREATE TABLE $TABLE_NAME ($COL_ID INTEGER PRIMARY KEY, $COL_TITLE TEXT UNIQUE, $COL_VALUE TEXT, $COL_TYPE INTEGER DEFAULT 0, $COL_PATH TEXT)" )
3333 insertFirstNote(db)
3434 }
3535
3636 override fun onUpgrade (db : SQLiteDatabase , oldVersion : Int , newVersion : Int ) {
3737 if (oldVersion < 2 )
38- db.execSQL(" ALTER TABLE ${ TABLE_NAME } ADD COLUMN ${ COL_TYPE } INTEGER DEFAULT 0" )
38+ db.execSQL(" ALTER TABLE $TABLE_NAME ADD COLUMN $COL_TYPE INTEGER DEFAULT 0" )
3939
4040 if (oldVersion < 3 )
41- db.execSQL(" ALTER TABLE ${ TABLE_NAME } ADD COLUMN ${ COL_PATH } TEXT" )
41+ db.execSQL(" ALTER TABLE $TABLE_NAME ADD COLUMN $COL_PATH TEXT" )
4242 }
4343
4444 private fun insertFirstNote (db : SQLiteDatabase ) {
@@ -66,12 +66,12 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
6666 }
6767
6868 fun deleteNote (id : Int ) {
69- mDb.delete(TABLE_NAME , " ${ COL_ID } = $id " , null )
69+ mDb.delete(TABLE_NAME , " $COL_ID = $id " , null )
7070 }
7171
7272 fun doesTitleExist (title : String ): Boolean {
7373 val cols = arrayOf(COL_ID )
74- val selection = " ${ COL_TITLE } = ?"
74+ val selection = " $COL_TITLE = ?"
7575 val selectionArgs = arrayOf(title)
7676 var cursor: Cursor ? = null
7777 try {
@@ -87,7 +87,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
8787 val cols = arrayOf(COL_ID , COL_TITLE , COL_VALUE , COL_TYPE )
8888 var cursor: Cursor ? = null
8989 try {
90- cursor = mDb.query(TABLE_NAME , cols, null , null , null , null , " ${ COL_TITLE } COLLATE NOCASE ASC" )
90+ cursor = mDb.query(TABLE_NAME , cols, null , null , null , null , " $COL_TITLE COLLATE NOCASE ASC" )
9191 if (cursor?.moveToFirst() == true ) {
9292 do {
9393 val id = cursor.getIntValue(COL_ID )
@@ -107,7 +107,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
107107
108108 fun getNote (id : Int ): Note ? {
109109 val cols = arrayOf(COL_TITLE , COL_VALUE , COL_TYPE )
110- val selection = " ${ COL_ID } = ?"
110+ val selection = " $COL_ID = ?"
111111 val selectionArgs = arrayOf(id.toString())
112112 var note: Note ? = null
113113 var cursor: Cursor ? = null
@@ -127,7 +127,7 @@ class DBHelper private constructor(private val mContext: Context) : SQLiteOpenHe
127127
128128 fun updateNote (note : Note ) {
129129 val values = fillContentValues(note)
130- val selection = " ${ COL_ID } = ?"
130+ val selection = " $COL_ID = ?"
131131 val selectionArgs = arrayOf(note.id.toString())
132132 mDb.update(TABLE_NAME , values, selection, selectionArgs)
133133 }
0 commit comments