apply alter column command only to the table (#1532)

* add alter column test

* apply alter column only to the table and ignore indices/triggers/views etc

* fix tests

* update bundle

* add test in rust_suite

Author: sivukhin

libsql-ffi/bundled/SQLite3MultipleCiphers/src/sqlite3.c

@@ -21663,7 +21663,7 @@ SQLITE_PRIVATE void sqlite3Reindex(Parse*, Token*, Token*);
 SQLITE_PRIVATE void sqlite3AlterFunctions(void);
 SQLITE_PRIVATE void sqlite3AlterRenameTable(Parse*, SrcList*, Token*);
 SQLITE_PRIVATE void sqlite3AlterRenameColumn(Parse*, SrcList*, Token*, Token*);
-void libsqlAlterAlterColumn(Parse*, SrcList*, Token*, Token*);
+void libsqlAlterAlterColumn(Parse*, SrcList*, Token*, Token*, int);
 SQLITE_PRIVATE int sqlite3GetToken(const unsigned char *, int *);
 SQLITE_PRIVATE void sqlite3NestedParse(Parse*, const char*, ...);
 SQLITE_PRIVATE void sqlite3ExpirePreparedStatements(sqlite3*, int);
@@ -116496,7 +116496,8 @@ void libsqlAlterAlterColumn(
   Parse *pParse,                  /* Parsing context */
   SrcList *pSrc,                  /* Table being altered.  pSrc->nSrc==1 */
   Token *pOld,                    /* Name of column being changed */
-  Token *pNew                     /* New column declaration */
+  Token *pNew,                    /* New column declaration */
+  int nNewSqlLength               /* New column declaration SQL string length (pNew.z is the start of the declaration) */
 ){
   sqlite3 *db = pParse->db;       /* Database connection */
   Table *pTab;                    /* Table being updated */
@@ -116554,9 +116555,7 @@ void libsqlAlterAlterColumn(
   }
   // NOTICE: this is the main difference in ALTER COLUMN compared to RENAME COLUMN,
   // we just take the whole new column declaration as it is.
-  // FIXME: the semicolon can also appear in the middle of the declaration when it's quoted,
-  // so we should check from the end.
-  pNew->n = sqlite3Strlen30(pNew->z);
+  pNew->n = nNewSqlLength;
   while (pNew->n > 0 && pNew->z[pNew->n - 1] == ';') pNew->n--;
   zNew = sqlite3DbStrNDup(db, pNew->z, pNew->n);
   if( !zNew ) goto exit_update_column;
@@ -116565,7 +116564,7 @@ void libsqlAlterAlterColumn(
   sqlite3NestedParse(pParse,
       "UPDATE \"%w\"." LEGACY_SCHEMA_TABLE " SET "
       "sql = libsql_alter_column(sql, %Q, %Q, %d, %Q, %d, %d, %d) "
-      "WHERE tbl_name = %Q",
+      "WHERE name = %Q AND type = 'table'",
       zDb,
       zDb, pTab->zName, iCol, zNew, bQuote, iSchema==1, pTab->aCol[iCol].colFlags,
       pTab->zName
@@ -117577,9 +117576,11 @@ static void renameColumnFunc(
 */
 static void alterColumnFunc(
   sqlite3_context *context,
-  int NotUsed,
+  int argc,
   sqlite3_value **argv
 ){
+  UNUSED_PARAMETER(argc);
+
   sqlite3 *db = sqlite3_context_db_handle(context);
   RenameCtx sCtx;
   const char *zSql = (const char*)sqlite3_value_text(argv[0]);
@@ -117602,7 +117603,6 @@ static void alterColumnFunc(
   sqlite3_xauth xAuth = db->xAuth;
 #endif
 
-  UNUSED_PARAMETER(NotUsed);
   if( zSql==0 ) return;
   if( zTable==0 ) return;
   if( zNew==0 ) return;
@@ -117655,9 +117655,10 @@ static void alterColumnFunc(
       }
     } else {
       rc = SQLITE_ERROR;
-      sParse.zErrMsg = sqlite3MPrintf(sParse.db, "Only ordinary tables can be altered, not ", IsView(sParse.pNewTable) ? "views" : "virtual tables");
-      goto alterColumnFunc_done;    }
-  } else if (sParse.pNewIndex) {
+      sParse.zErrMsg = sqlite3MPrintf(sParse.db, "Only ordinary tables can be altered, not %s", IsView(sParse.pNewTable) ? "views" : "virtual tables");
+      goto alterColumnFunc_done;
+    }
+  } else if( sParse.pNewIndex ){
     rc = SQLITE_ERROR;
     sParse.zErrMsg = sqlite3MPrintf(sParse.db, "Only ordinary tables can be altered, not indexes");
     goto alterColumnFunc_done;
@@ -176759,7 +176760,8 @@ static YYACTIONTYPE yy_reduce(
         break;
       case 301: /* cmd ::= ALTER TABLE fullname ALTER COLUMNKW columnname TO columnname carglist */
 {
-  libsqlAlterAlterColumn(pParse, yymsp[-6].minor.yy203, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0);
+  int definitionLength = (int)(pParse->sLastToken.z-yymsp[-1].minor.yy0.z) + pParse->sLastToken.n;
+  libsqlAlterAlterColumn(pParse, yymsp[-6].minor.yy203, &yymsp[-3].minor.yy0, &yymsp[-1].minor.yy0, definitionLength);
 }
         break;
       case 302: /* cmd ::= create_vtab */

libsql-ffi/bundled/bindings/bindgen.rs

@@ -23,6 +23,7 @@ extern "C" {
     ) -> ::std::os::raw::c_int;
 }
 
+pub const __GNUC_VA_LIST: i32 = 1;
 pub const SQLITE_VERSION: &[u8; 7] = b"3.44.0\0";
 pub const SQLITE_VERSION_NUMBER: i32 = 3044000;
 pub const SQLITE_SOURCE_ID: &[u8; 85] =
@@ -499,8 +500,8 @@ pub const FTS5_TOKENIZE_DOCUMENT: i32 = 4;
 pub const FTS5_TOKENIZE_AUX: i32 = 8;
 pub const FTS5_TOKEN_COLOCATED: i32 = 1;
 pub const WAL_SAVEPOINT_NDATA: i32 = 4;
-pub type __gnuc_va_list = __builtin_va_list;
 pub type va_list = __builtin_va_list;
+pub type __gnuc_va_list = __builtin_va_list;
 extern "C" {
     pub static sqlite3_version: [::std::os::raw::c_char; 0usize];
 }
@@ -937,7 +938,7 @@ extern "C" {
 extern "C" {
     pub fn sqlite3_vmprintf(
         arg1: *const ::std::os::raw::c_char,
-        arg2: va_list,
+        arg2: *mut __va_list_tag,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -953,7 +954,7 @@ extern "C" {
         arg1: ::std::os::raw::c_int,
         arg2: *mut ::std::os::raw::c_char,
         arg3: *const ::std::os::raw::c_char,
-        arg4: va_list,
+        arg4: *mut __va_list_tag,
     ) -> *mut ::std::os::raw::c_char;
 }
 extern "C" {
@@ -2500,7 +2501,7 @@ extern "C" {
     pub fn sqlite3_str_vappendf(
         arg1: *mut sqlite3_str,
         zFormat: *const ::std::os::raw::c_char,
-        arg2: va_list,
+        arg2: *mut __va_list_tag,
     );
 }
 extern "C" {
@@ -3503,4 +3504,12 @@ extern "C" {
 extern "C" {
     pub static sqlite3_wal_manager: libsql_wal_manager;
 }
-pub type __builtin_va_list = *mut ::std::os::raw::c_char;
+pub type __builtin_va_list = [__va_list_tag; 1usize];
+#[repr(C)]
+#[derive(Debug, Copy, Clone)]
+pub struct __va_list_tag {
+    pub gp_offset: ::std::os::raw::c_uint,
+    pub fp_offset: ::std::os::raw::c_uint,
+    pub overflow_arg_area: *mut ::std::os::raw::c_void,
+    pub reg_save_area: *mut ::std::os::raw::c_void,
+}

libsql-ffi/bundled/src/sqlite3.c

@@ -116564,7 +116564,7 @@ void libsqlAlterAlterColumn(
   sqlite3NestedParse(pParse,
       "UPDATE \"%w\"." LEGACY_SCHEMA_TABLE " SET "
       "sql = libsql_alter_column(sql, %Q, %Q, %d, %Q, %d, %d, %d) "
-      "WHERE tbl_name = %Q",
+      "WHERE name = %Q AND type = 'table'",
       zDb,
       zDb, pTab->zName, iCol, zNew, bQuote, iSchema==1, pTab->aCol[iCol].colFlags,
       pTab->zName

libsql-sqlite3/src/alter.c

@@ -758,7 +758,7 @@ void libsqlAlterAlterColumn(
   sqlite3NestedParse(pParse, 
       "UPDATE \"%w\"." LEGACY_SCHEMA_TABLE " SET "
       "sql = libsql_alter_column(sql, %Q, %Q, %d, %Q, %d, %d, %d) "
-      "WHERE tbl_name = %Q",
+      "WHERE name = %Q AND type = 'table'",
       zDb,
       zDb, pTab->zName, iCol, zNew, bQuote, iSchema==1, pTab->aCol[iCol].colFlags,
       pTab->zName

libsql-sqlite3/test/libsql_alter.test

@@ -12,28 +12,35 @@ source $testdir/tester.tcl
 do_test libsql_alter-ok.1 {
   execsql {CREATE TABLE t1(x);}
   execsql {ALTER TABLE t1 ALTER COLUMN x TO x;}
-  execsql {SELECT sql FROM sqlite_master WHERE tbl_name = 't1';}
+  execsql {SELECT sql FROM sqlite_master WHERE name = 't1';}
 } {{CREATE TABLE t1(x)}}
 
 do_test libsql_alter-ok.2 {
   execsql {CREATE TABLE t2(x);}
   execsql {ALTER TABLE t2 ALTER COLUMN x TO x INTEGER DEFAULT(-1);}
-  execsql {SELECT sql FROM sqlite_master WHERE tbl_name = 't2';}
+  execsql {SELECT sql FROM sqlite_master WHERE name = 't2';}
 } {{CREATE TABLE t2(x INTEGER DEFAULT(-1))}}
 
 do_test libsql_alter-ok.3 {
   execsql {CREATE TABLE t3(x);}
   # NOTE: extra spaces in the end of ALTER COLUMN command
   execsql { ALTER TABLE t3 ALTER COLUMN x TO x INTEGER DEFAULT(-1);   }
-  execsql {SELECT sql FROM sqlite_master WHERE tbl_name = 't3';}
+  execsql {SELECT sql FROM sqlite_master WHERE name = 't3';}
 } {{CREATE TABLE t3(x INTEGER DEFAULT(-1))}}
 
 do_test libsql_alter-ok.4 {
   execsql {CREATE TABLE t4(x);}
   execsql { ALTER TABLE t4 ALTER COLUMN x TO x INTEGER DEFAULT(-1); -- explain alter command }
-  execsql {SELECT sql FROM sqlite_master WHERE tbl_name = 't4';}
+  execsql {SELECT sql FROM sqlite_master WHERE name = 't4';}
 } {{CREATE TABLE t4(x INTEGER DEFAULT(-1))}}
 
+do_test libsql_alter-ok.5 {
+  execsql {CREATE TABLE t5(x);}
+  execsql {CREATE INDEX t5_idx ON t5(x);}
+  execsql {ALTER TABLE t5 ALTER COLUMN x TO x TEXT}
+  execsql {SELECT sql FROM sqlite_master WHERE name = 't5';}
+} {{CREATE TABLE t5(x TEXT)}}
+
 reset_db
 do_test libsql_alter-err.1 {
   execsql { CREATE TABLE t1(x); }

libsql-sqlite3/test/rust_suite/src/alter_column.rs

@@ -196,3 +196,13 @@ fn test_comment_in_the_end() {
     )
     .unwrap();
 }
+
+#[test]
+fn test_table_with_index() {
+    let conn = Connection::open_in_memory().unwrap();
+
+    conn.execute("CREATE TABLE t(id)", ()).unwrap();
+    conn.execute("CREATE INDEX i ON t(id)", ()).unwrap();
+    conn.execute("ALTER TABLE t ALTER COLUMN id TO id TEXT", ())
+        .unwrap();
+}