Skip to content

Update generated views and triggers #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ inherits = "release"
lto = false

[workspace.package]
version = "0.1.4"
version = "0.1.5"
edition = "2021"
authors = ["JourneyApps"]
keywords = ["sqlite", "powersync"]
Expand Down
2 changes: 1 addition & 1 deletion android/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ plugins {
}

group = "co.powersync"
version = "0.1.4"
version = "0.1.5"
description = "PowerSync Core SQLite Extension"

repositories {
Expand Down
1 change: 1 addition & 0 deletions crates/core/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ pub fn extract_table_info(db: *mut sqlite::sqlite3, data: &str) -> Result<Manage
// language=SQLite
let statement = db.prepare_v2("SELECT
json_extract(?1, '$.name') as name,
ifnull(json_extract(?1, '$.view_name'), json_extract(?1, '$.name')) as view_name,
json_extract(?1, '$.local_only') as local_only,
json_extract(?1, '$.insert_only') as insert_only")?;
statement.bind_text(1, data, sqlite::Destructor::STATIC)?;
Expand Down
43 changes: 28 additions & 15 deletions crates/core/src/views.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@ fn powersync_view_sql_impl(
let statement = extract_table_info(db, table)?;

let name = statement.column_text(0)?;
let local_only = statement.column_int(1)? != 0;
let view_name = statement.column_text(1)?;
let local_only = statement.column_int(2)? != 0;

let quoted_name = quote_identifier(name);
let quoted_name = quote_identifier(view_name);
let internal_name = quote_internal_name(name, local_only);

let stmt2 = db.prepare_v2("select json_extract(e.value, '$.name') as name, json_extract(e.value, '$.type') as type from json_each(json_extract(?, '$.columns')) e")?;
Expand Down Expand Up @@ -68,12 +69,13 @@ fn powersync_trigger_delete_sql_impl(
let statement = extract_table_info(ctx.db_handle(), table)?;

let name = statement.column_text(0)?;
let local_only = statement.column_int(1)? != 0;
let insert_only = statement.column_int(2)? != 0;
let view_name = statement.column_text(1)?;
let local_only = statement.column_int(2)? != 0;
let insert_only = statement.column_int(3)? != 0;

let quoted_name = quote_identifier(name);
let quoted_name = quote_identifier(view_name);
let internal_name = quote_internal_name(name, local_only);
let trigger_name = quote_identifier_prefixed("ps_view_delete_", name);
let trigger_name = quote_identifier_prefixed("ps_view_delete_", view_name);
let type_string = quote_string(name);

return if !local_only && !insert_only {
Expand All @@ -84,7 +86,16 @@ FOR EACH ROW
BEGIN
DELETE FROM {:} WHERE id = OLD.id;
INSERT INTO powersync_crud_(data) VALUES(json_object('op', 'DELETE', 'type', {:}, 'id', OLD.id));
END", trigger_name, quoted_name, internal_name, type_string);
INSERT INTO ps_oplog(bucket, op_id, op, row_type, row_id, hash, superseded)
SELECT '$local',
1,
'REMOVE',
{:},
OLD.id,
0,
0;
INSERT OR REPLACE INTO ps_buckets(name, pending_delete, last_op, target_op) VALUES('$local', 1, 0, {:});
END", trigger_name, quoted_name, internal_name, type_string, type_string, MAX_OP_ID);
Ok(trigger)
} else if local_only {
let trigger = format!("\
Expand Down Expand Up @@ -116,12 +127,13 @@ fn powersync_trigger_insert_sql_impl(
let statement = extract_table_info(ctx.db_handle(), table)?;

let name = statement.column_text(0)?;
let local_only = statement.column_int(1)? != 0;
let insert_only = statement.column_int(2)? != 0;
let view_name = statement.column_text(1)?;
let local_only = statement.column_int(2)? != 0;
let insert_only = statement.column_int(3)? != 0;

let quoted_name = quote_identifier(name);
let quoted_name = quote_identifier(view_name);
let internal_name = quote_internal_name(name, local_only);
let trigger_name = quote_identifier_prefixed("ps_view_insert_", name);
let trigger_name = quote_identifier_prefixed("ps_view_insert_", view_name);
let type_string = quote_string(name);

let local_db = ctx.db_handle();
Expand Down Expand Up @@ -199,12 +211,13 @@ fn powersync_trigger_update_sql_impl(
let statement = extract_table_info(ctx.db_handle(), table)?;

let name = statement.column_text(0)?;
let local_only = statement.column_int(1)? != 0;
let insert_only = statement.column_int(2)? != 0;
let view_name = statement.column_text(1)?;
let local_only = statement.column_int(2)? != 0;
let insert_only = statement.column_int(3)? != 0;

let quoted_name = quote_identifier(name);
let quoted_name = quote_identifier(view_name);
let internal_name = quote_internal_name(name, local_only);
let trigger_name = quote_identifier_prefixed("ps_view_update_", name);
let trigger_name = quote_identifier_prefixed("ps_view_update_", view_name);
let type_string = quote_string(name);

let db = ctx.db_handle();
Expand Down
2 changes: 1 addition & 1 deletion powersync-sqlite-core.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'powersync-sqlite-core'
s.version = '0.1.4'
s.version = '0.1.5'
s.summary = 'PowerSync SQLite Extension'
s.description = <<-DESC
PowerSync extension for SQLite.
Expand Down